Changeset 583 for trunk/xpressme_integration_kit/include/onupdate.php

Timestamp:

Apr 23, 2010, 10:49:33 AM (14 years ago)

Author:

toemon

Message:

xoops_mod_wordpress060_alphaの複製モジュールからのアップデート対応 fixes#335

File:

• trunk/xpressme_integration_kit/include/onupdate.php (modified) (6 diffs)

trunk/xpressme_integration_kit/include/onupdate.php

@@ -81 +81 @@
 function xpress_put_siteurl($mydirname,$url){
                 global $xoopsModule;
-                $wp_prefix = $mydirname;
-                if ($wp_prefix == 'wordpress'){
-                        $wp_prefix = 'wp';
-                }
+                $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
                 $xoopsDB =& Database::getInstance();
                 $db_xpress_option = $xoopsDB->prefix($wp_prefix . '_options');
@@ -96 +93 @@
 function xpress_put_home($mydirname,$url){
                 global $xoopsModule;
-                $wp_prefix = $mydirname;
-                if ($wp_prefix == 'wordpress'){
-                        $wp_prefix = 'wp';
-                }
+                $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
                 $xoopsDB =& Database::getInstance();
                 $db_xpress_option = $xoopsDB->prefix($wp_prefix . '_options');
@@ -111 +105 @@
         function get_xpress_option($mydirname,$option_name){
                 global $xoopsModule;
-                $wp_prefix = $mydirname;
-                if ($wp_prefix == 'wordpress'){
-                        $wp_prefix = 'wp';
-                }
+                $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
                 $xoopsDB =& Database::getInstance();
                 $option_table = $xoopsDB->prefix($wp_prefix . '_options');
@@ -145 +136 @@
 function get_db_version($mydirname){
                 global $xoopsModule;
-                $wp_prefix = $mydirname;
-                if ($wp_prefix == 'wordpress'){
-                        $wp_prefix = 'wp';
-                }
+                $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
                 $xoopsDB =& Database::getInstance();
                 $db_xpress_option = $xoopsDB->prefix($wp_prefix . '_options');
@@ -192 +180 @@
 function xpress_table_make($module, $mydirname)
 {
-        $xp_prefix = $mydirname;
-        if ($xp_prefix == 'wordpress'){
-                $xp_prefix = 'wp';
-        }
         $db =& Database::getInstance() ;
         $mid = $module->getVar('mid') ;
 
 // XPressME orignal table update
-        $xp_prefix = $mydirname;
-        if ($xp_prefix == 'wordpress'){
-                $xp_prefix = 'wp';
-        }
+        $xp_prefix = preg_replace('/wordpress/','wp',$mydirname);
         $msgs = array();
 
@@ -307 +288 @@
                 
                 $xoopsDB =& Database::getInstance();
-                if ($mydirname == 'wordpress'){
-                        $xpress_prefix=  $xoopsDB->prefix('wp_');
-                } else {
-                        $xpress_prefix=  $xoopsDB->prefix($mydirname . '_');
-                }
+                $xpress_prefix = $xoopsDB->prefix(preg_replace('/wordpress/','wp',$mydirname) . '_');
                 $db_enhanced = $xpress_prefix . $table_name;