Changeset 21707


Ignore:
Timestamp:
2012/04/03 19:58:53 (9 years ago)
Author:
Yammy
Message:

プラグイン有効化時のエラー修正

refs #1729

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php

    r21706 r21707  
    859859        foreach ($hookPoints as $hookPoint) { 
    860860            // 競合するプラグインを取得する, 
    861             $table = 'dtb_plugin_hookpoint AS T1 LEFT JOIN dtb_plugin AS T2 ON T1.plugin_id = T2.plugin_id'; 
    862             $where = 'T1.hook_point = ? AND NOT T1.plugin_id = ? AND T2.enable = ' . PLUGIN_ENABLE_TRUE . ' GROUP BY T1.plugin_id'; 
     861            $table = 'dtb_plugin_hookpoint AS T1 LEFT JOIN dtb_plugin AS T2 USING(plugin_id)'; 
     862            $where = 'T1.hook_point = ? AND NOT T1.plugin_id = ? AND T2.enable = ' . PLUGIN_ENABLE_TRUE; 
     863            $objQuery->setGroupBy('T1.plugin_id, T2.plugin_name'); 
    863864            $conflictPlugins = $objQuery->select('T1.plugin_id, T2.plugin_name', $table, $where, array($hookPoint['hook_point'], $hookPoint['plugin_id'])); 
    864865 
Note: See TracChangeset for help on using the changeset viewer.