Changeset 749 for branches/Ver3.0/xpressme_integration_kit/admin/index.php

Timestamp:

May 19, 2011, 6:47:15 PM (13 years ago)

Author:

toemon

Message:

Database::getInstance()を使わずに、global $xoopsDB を使用する。（xoops3対策)

File:

• branches/Ver3.0/xpressme_integration_kit/admin/index.php (modified) (5 diffs)

branches/Ver3.0/xpressme_integration_kit/admin/index.php

@@ -31 +31 @@
 
 function admin_check_user_meta_prefix($is_report = false){
-        global $xoopsModule;
-        $xoopsDB =& Database::getInstance();
+        global $xoopsModule,$xoopsDB;
         
         $mydirname = basename(dirname(dirname(__FILE__)));
@@ -114 +113 @@
 function get_xpress_active_plugin_list($before_str = '')
 {
-        global $xoopsModule;
-        $xoopsDB =& Database::getInstance();
+        global $xoopsModule,$xoopsDB;
         
         $mydirname = basename(dirname(dirname(__FILE__)));
@@ -537 +535 @@
 function xpress_state($is_report = false)
 {
-        global $xoopsModule;
+        global $xoopsModule,$xoopsDB;
         include(dirname(__FILE__) . '/../wp-includes/version.php');
         include_once(dirname(__FILE__) . '/../include/general_functions.php');
 
-        $xoopsDB =& Database::getInstance();
         
         $xp_prefix = $GLOBALS['xoopsModule']->getInfo('dirname');
@@ -613 +610 @@
 function xpress_group_role_state($is_report = false)
 {
-        global $xoopsModule;
-        $xoopsDB =& Database::getInstance();
+        global $xoopsModule,$xoopsDB;
         $xp_prefix = $GLOBALS['xoopsModule']->getInfo('dirname');
         $xp_prefix = preg_replace('/wordpress/','wp',$xp_prefix);
@@ -692 +688 @@
 function xpress_block_options($is_report = false)
 {
+        global $xoopsModule;
         $mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
 
         $module_objs = & get_module_objects($mydirname);
         $module_obj = $module_objs[0];
-        $mod_id = $module_obj->getVar('mid', 'n');
+        $mod_id = $xoopsModule->getVar('mid', 'n');
         $blocks = & get_block_object_orber_num_bymodule_id( $mod_id );
-        $infos    =& $module_obj->getInfo('blocks');
+        $infos    = $xoopsModule->getInfo('blocks');
         if ($is_report){
                 echo "******** " . _AM_XP2_BLOCK_OPTIONS . "********" . "<br />\n";