Changeset 21724

Timestamp:

2012/04/09 22:35:20 (12 years ago)

Author:

adachi

Message:

#1692 SC_PluginUtil::deletePluginByPluginIdを使用するように修正.

Location:

branches/version-2_12-dev/data/class

Files:

• pages/admin/system/LC_Page_Admin_System_Plugin.php (modified) (1 diff)
• plugin/SC_Plugin_Util.php (modified) (1 diff)

branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php

@@ -757 +757 @@
     function deletePlugin($plugin_id, $plugin_code) {
         $arrErr = array();
-
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->begin();
-        $where = 'plugin_id = ?';
-        $objQuery->delete('dtb_plugin', $where, array($plugin_id));
-        $objQuery->delete('dtb_plugin_hookpoint', $where, array($plugin_id));
-
-        if ($objQuery->commit()) {
-            if (SC_Utils_Ex::deleteFile($this->getPluginDir($plugin_code)) === false) {
-                // TODO エラー処理
-            } 
-
-            if (SC_Utils_Ex::deleteFile($this->getHtmlPluginDir($plugin_code)) === false) {
-                // TODO エラー処理
-            }       
-        }
+        
+        SC_Plugin_Util_Ex::deletePluginByPluginId($plugin_id);
+
+        if (SC_Utils_Ex::deleteFile($this->getPluginDir($plugin_code)) === false) {
+            // TODO エラー処理
+        }
+
+        if (SC_Utils_Ex::deleteFile($this->getHtmlPluginDir($plugin_code)) === false) {
+            // TODO エラー処理
+        }
+        
+        $objQuery->commit();
+        
         return $arrErr;
     }

branches/version-2_12-dev/data/class/plugin/SC_Plugin_Util.php

@@ -101 +101 @@
     function deletePluginByPluginId($plugin_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->begin();
         $where = 'plugin_id = ?';
         $objQuery->delete('dtb_plugin', $where, array($plugin_id));