Changeset 20001 for branches/version-2_5-dev/data/class

Timestamp:

2011/01/20 04:24:30 (15 years ago)

Author:

Seasoft

Message:

#834(パスに関わるパラメータ名が不適切)

Location:

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

Files:

• SC_Plugin.php (modified) (1 diff)
• pages/admin/plugin/LC_Page_Admin_Plugin.php (modified) (1 diff)
• pages/admin/plugin/LC_Page_Admin_Plugin_Install.php (modified) (1 diff)
• pages/admin/plugin/LC_Page_Admin_Plugin_Uninstall.php (modified) (1 diff)
• util/SC_Utils.php (modified) (3 diffs)

branches/version-2_5-dev/data/class/SC_Plugin.php

@@ -16 +16 @@
 
     function __construct(){
-        if (!defined(PLUGIN_PATH)) {
-            define('PLUGIN_PATH', USER_REALDIR . 'plugins/');
+        if (!defined(PLUGIN_REALDIR)) {
+            define('PLUGIN_REALDIR', USER_REALDIR . 'plugins/');
         }
         $this->init();

branches/version-2_5-dev/data/class/pages/admin/plugin/LC_Page_Admin_Plugin.php

@@ -91 +91 @@
         $this->arrInstallablePlugin = array();
 
-        $d = dir(PLUGIN_PATH);
+        $d = dir(PLUGIN_REALDIR);
         while (false !== ($entry = $d->read())) {
             if ($entry == '.') continue;

branches/version-2_5-dev/data/class/pages/admin/plugin/LC_Page_Admin_Plugin_Install.php

@@ -107 +107 @@
 
         // アンインストール SQL を実行 (クリーンアップ)
-        SC_Helper_DB_Ex::sfExecSqlByFile(PLUGIN_PATH . "$path/sql/uninstall.sql");
+        SC_Helper_DB_Ex::sfExecSqlByFile(PLUGIN_REALDIR . "$path/sql/uninstall.sql");
 
         // インストール SQL を実行
-        SC_Helper_DB_Ex::sfExecSqlByFile(PLUGIN_PATH . "$path/sql/install.sql");
+        SC_Helper_DB_Ex::sfExecSqlByFile(PLUGIN_REALDIR . "$path/sql/install.sql");
 
         // プラグイン XML に追加

branches/version-2_5-dev/data/class/pages/admin/plugin/LC_Page_Admin_Plugin_Uninstall.php

@@ -108 +108 @@
 
         // アンインストール SQL を実行
-        SC_Helper_DB_Ex::sfExecSqlByFile(PLUGIN_PATH . "$path/sql/uninstall.sql");
+        SC_Helper_DB_Ex::sfExecSqlByFile(PLUGIN_REALDIR . "$path/sql/uninstall.sql");
 
         // プラグイン XML から削除

branches/version-2_5-dev/data/class/util/SC_Utils.php

@@ -2125 +2125 @@
      */
     function sfGetPluginInfoArray($path) {
-        return (array)include_once(PLUGIN_PATH . "$path/plugin_info.php");
+        return (array)include_once(PLUGIN_REALDIR . "$path/plugin_info.php");
     }
 
@@ -2136 +2136 @@
      */
     function sfGetPluginsXml() {
-        return simplexml_load_file(PLUGIN_PATH . 'plugins.xml');
+        return simplexml_load_file(PLUGIN_REALDIR . 'plugins.xml');
     }
 
@@ -2153 +2153 @@
         if (strlen($xml) == 0) SC_Utils_Ex::sfDispException();
 
-        $return = file_put_contents(PLUGIN_PATH . 'plugins.xml', $pluginsXml->asXML());
+        $return = file_put_contents(PLUGIN_REALDIR . 'plugins.xml', $pluginsXml->asXML());
         if ($return === false) SC_Utils_Ex::sfDispException();
         return $return;