Merge remote-tracking branch 'sf/2.2.x' into cc-4585
This commit is contained in:
commit
e01a61208d
3 changed files with 28 additions and 27 deletions
|
@ -321,7 +321,7 @@ class LibraryController extends Zend_Controller_Action
|
|||
|
||||
if (isset($file)) {
|
||||
try {
|
||||
$res = $file->delete(true);
|
||||
$res = $file->delete();
|
||||
} catch (FileNoPermissionException $e) {
|
||||
$message = $noPermissionMsg;
|
||||
} catch (Exception $e) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue