Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged Naomi's change for CC-1955

This commit is contained in:
paul.baranowski 2011-02-22 18:26:51 +01:00
parent 15153727c1 92545b53a6
commit 7e8f61549e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/LibraryController.php
View File

@ -112,7 +112,7 @@ class LibraryController extends Zend_Controller_Action
return; return;
} }
$res = $file->delete(); $res = $file->deleteFile();
if (PEAR::isError($res)) { if (PEAR::isError($res)) {
$this->view->message = $res->getMessage(); $this->view->message = $res->getMessage();

4
application/models/StoredFile.php
View File

@ -1836,8 +1836,8 @@ class StoredFile {
$innerCond = array(); $innerCond = array();
foreach($searchCols as $col) { foreach($searchCols as $col) {
$escapedTerm = pg_escape_string($term);
$innerCond[] = "{$col}::text ILIKE '%{$term}%'"; $innerCond[] = "{$col}::text ILIKE '%{$escapedTerm}%'";
} }
$outerCond[] = "(".join(" OR ", $innerCond).")"; $outerCond[] = "(".join(" OR ", $innerCond).")";
} }