Преглед изворни кода

Ticket #4872 - Albums: Image deletion returns PHP error.

AntonLV пре 1 година
родитељ
комит
3c1946d6f8

+ 1 - 1
modules/boonex/albums/classes/BxAlbumsConfig.php

@@ -143,7 +143,7 @@ class BxAlbumsConfig extends BxBaseModTextConfig
             'OBJECT_MENU_MANAGE_TOOLS' => 'bx_albums_menu_manage_tools', //manage menu in content administration tools
             'OBJECT_GRID_ADMINISTRATION' => 'bx_albums_administration',
             'OBJECT_GRID_COMMON' => 'bx_albums_common',
-            'OBJECT_UPLOADERS' => array('bx_albums_simple', 'bx_albums_html5', 'bx_albums_crop'),
+            'OBJECT_UPLOADERS' => array('bx_albums_html5', 'bx_albums_crop'),
             
             'FUNCTION_FOR_GET_ITEM_INFO' => 'getMediaInfoById',
 

+ 10 - 3
modules/boonex/albums/classes/BxAlbumsModule.php

@@ -792,11 +792,18 @@ class BxAlbumsModule extends BxBaseModTextModule
     {
         $CNF = &$this->_oConfig->CNF;
 
+        $sUploader = reset($CNF['OBJECT_UPLOADERS']);
         $aMediaInfo = $this->_oDb->getMediaInfoById($iMediaId);
-        $oUploader = BxDolUploader::getObjectInstance($CNF['OBJECT_UPLOADERS'][0], $CNF['OBJECT_STORAGE'], '');
+        if(!$sUploader || empty($aMediaInfo) || !is_array($aMediaInfo))
+            return echoJson([]);
+
+        $oUploader = BxDolUploader::getObjectInstance($sUploader, $CNF['OBJECT_STORAGE'], '');
+        if($oUploader === false) 
+            return echoJson(['msg' => _t('_sys_txt_error_occured')]);
+
         $oUploader->deleteGhost($aMediaInfo['file_id'], bx_get_logged_profile_id());
-        
-        echoJson(['redirect' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aMediaInfo['content_id']))]);
+
+        return echoJson(['redirect' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aMediaInfo['content_id']))]);            
     }
 
     public function actionMoveMedia($iMediaId)

+ 1 - 1
modules/boonex/albums/install/sql/disable.sql

@@ -50,7 +50,7 @@ DELETE FROM `sys_grid_actions` WHERE `object` IN ('bx_albums_administration', 'b
 
 
 -- UPLOADERS
-DELETE FROM `sys_objects_uploader` WHERE `object` IN('bx_albums_simple', 'bx_albums_html5', 'bx_albums_crop', 'bx_albums_record_video');
+DELETE FROM `sys_objects_uploader` WHERE `object` IN('bx_albums_html5', 'bx_albums_crop', 'bx_albums_record_video');
 
 
 -- ALERTS