Merged Naomi's change for CC-1955
This commit is contained in:
commit
7e8f61549e
|
@ -112,7 +112,7 @@ class LibraryController extends Zend_Controller_Action
|
|||
return;
|
||||
}
|
||||
|
||||
$res = $file->delete();
|
||||
$res = $file->deleteFile();
|
||||
|
||||
if (PEAR::isError($res)) {
|
||||
$this->view->message = $res->getMessage();
|
||||
|
|
|
@ -1836,8 +1836,8 @@ class StoredFile {
|
|||
$innerCond = array();
|
||||
|
||||
foreach($searchCols as $col) {
|
||||
|
||||
$innerCond[] = "{$col}::text ILIKE '%{$term}%'";
|
||||
$escapedTerm = pg_escape_string($term);
|
||||
$innerCond[] = "{$col}::text ILIKE '%{$escapedTerm}%'";
|
||||
}
|
||||
$outerCond[] = "(".join(" OR ", $innerCond).")";
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue