Index: branches/5.1.x/core/units/images/image_event_handler.php =================================================================== diff -u -N -r12657 -r13086 --- branches/5.1.x/core/units/images/image_event_handler.php (.../image_event_handler.php) (revision 12657) +++ branches/5.1.x/core/units/images/image_event_handler.php (.../image_event_handler.php) (revision 13086) @@ -1,6 +1,6 @@ Special == 'list' && !$this->Application->IsAdmin()) { + if ($event->Special == 'list' && !$this->Application->isAdmin) { // ListImages aggregated tag uses this special return ''; } @@ -246,6 +246,11 @@ */ function OnMassDelete(&$event) { + if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) { + $event->status = erFAIL; + return; + } + $event->status=erSUCCESS; $temp =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler'); @@ -301,8 +306,7 @@ $object =& $event->getObject(); $type_clauses = Array(); - if( !$this->Application->IsAdmin() ) - { + if (!$this->Application->isAdminUser) { $object->addFilter('active', '%1$s.Enabled = 1'); }