Changeset 208 for trunk/include

Timestamp:

May 19, 2009, 7:34:21 PM (15 years ago)

Author:

toemon

Message:

アップデートでXPressME用のテーブルが無いときdbDelta()が初期化されていないのでエラーになるバグ修正

File:

• trunk/include/onupdate.php (modified) (2 diffs)

trunk/include/onupdate.php

@@ -23 +23 @@
         $mid = $module->getVar('mid') ;
 
-// XPressME orignal table updayte
+
+
+//XPressME Update
+        global $wpdb,$wp_rewrite, $wp_queries, $table_prefix, $wp_db_version, $wp_roles,$wp_query;
+        define('WP_INSTALLING', true);
+        $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+        $path = $mydirpath . '/';
+        
+/* 
+ * xpress_put_siteurl($mydirname,''); 
+ * Call to a member function register() The on a non-object error is evaded.
+ * It happens by register_widget() that exists in wp-includes/widgets.php. 
+ * The blog is not installed. It is cheating to function wp_maybe_load_widgets(). 
+ * As a result, default-widgets.php is not loaded.
+ */
+        xpress_put_siteurl($mydirname,'');                              // Site_url is temporarily deleted. 
+        
+        if (file_exists($path . 'wp-load.php')) {
+                require_once $path . 'wp-load.php';
+        } else {
+                require_once $path . 'wp-config.php';
+        }
+
+// XPressME orignal table update
         if (! enhanced_table_check($mydirname,'views')){
                 $xp_prefix = $mydirname;
@@ -114 +137 @@
         $msgs = array_merge($msgs,$t_mess);
 
-
-//Wordpress TABLE UPGRADE
-        global $wpdb,$wp_rewrite, $wp_queries, $table_prefix, $wp_db_version, $wp_roles,$wp_query;
-        define('WP_INSTALLING', true);
-        $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
-        $path = $mydirpath . '/';
-        
-/* 
- * xpress_put_siteurl($mydirname,''); 
- * Call to a member function register() The on a non-object error is evaded.
- * It happens by register_widget() that exists in wp-includes/widgets.php. 
- * The blog is not installed. It is cheating to function wp_maybe_load_widgets(). 
- * As a result, default-widgets.php is not loaded.
- */
-        xpress_put_siteurl($mydirname,'');                              // Site_url is temporarily deleted. 
-        
-        if (file_exists($path . 'wp-load.php')) {
-                require_once $path . 'wp-load.php';
-        } else {
-                require_once $path . 'wp-config.php';
-        }
+// upgrade WordPress
         
         $site_url= XOOPS_URL."/modules/".$mydirname;