Changeset 749 for branches/Ver3.0/xpressme_integration_kit/include/xpress_block_render.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/include/xpress_block_render.php (modified) (5 diffs)

branches/Ver3.0/xpressme_integration_kit/include/xpress_block_render.php

@@ -46 +46 @@
         function get_block_id($mydirname,$func_file,$options)
         {
+                global $xoopsDB;
                 $options_string = '';
                 $mid = get_block_mid($mydirname);
@@ -52 +53 @@
                         $options_string .= $val;
                 }
-                        $xoopsDB =& Database::getInstance();
                         $block_tbl = $xoopsDB->prefix('newblocks');     
                         $module_dir = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
@@ -67 +67 @@
         function get_block_mid($mydirname)
         {
-                        $xoopsDB =& Database::getInstance();
+                global $xoopsDB;
                         $modules_tbl = $xoopsDB->prefix('modules');
 
@@ -81 +81 @@
         function get_xpress_theme_name($mydirname)
         {
-                global $wpdb;
+                global $wpdb,$xoopsDB;
                 
                 if (is_null($wpdb)){
-                        $xoopsDB =& Database::getInstance();
                         $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
 
@@ -305 +304 @@
     
     function get_xpress_mod_config($mydirname,$conf_name=''){
+        global $xoopsDB;
                 $module_handler =& xoops_gethandler('module');
                 $xoopsModule =& $module_handler->getByDirname($mydirname);
                 $mid = $xoopsModule->getVar('mid');
-                $xoopsDB =& Database::getInstance();
                 $db_config = $xoopsDB->prefix('config');