Changeset 531 for trunk/xpressme_integration_kit/include/oninstall.php

Timestamp:

Mar 9, 2010, 10:47:23 AM (14 years ago)

Author:

toemon

Message:

WordPressMU対応コードの削除 Fixes #294

File:

• trunk/xpressme_integration_kit/include/oninstall.php (modified) (2 diffs)

trunk/xpressme_integration_kit/include/oninstall.php

@@ -167 +167 @@
         if ( !$user_id ) {
                 $random_password = 'admin';
-                if (!$xoops_config->is_wpmu){
-                        $user_id = wp_create_user($user_name, $random_password, $email);
-                } else {
-                        $user_id = wpmu_create_user($user_name, $random_password, $email);
-                }
+                $user_id = wp_create_user($user_name, $random_password, $email);
         } else {
                 $random_password = __('User already exists.  Password inherited.');
@@ -186 +182 @@
         
 // Set Default data
-        if (!$xoops_config->is_wpmu){   // for WordPress 
-                // make WordPress Default data  
-                if (function_exists('wp_install_defaults')){
-                        wp_install_defaults($user_id);
-                } else {
-                        wp_install_old_defaults($user_id);
-                }
-                
-                $ret[] = 'The first sample post & comment was written.<br />';
-                
-                // Rewrite Option for Xpress
-                        if (WPLANG == 'ja_EUC') {
-                                $setup_charset = 'EUC-JP';
-                        } elseif(WPLANG == 'ja_SJIS') {
-                                $setup_charset = 'Shift_JIS';
-                        } else {
-                                $setup_charset = 'UTF-8';
-                        }
-                        update_option("blog_charset", $setup_charset);
-
-                        update_option('blogname', $site_name ); 
-                        update_option('blogdescription', 'WordPress for XOOPS');
-                        update_option("admin_email", $GLOBALS["xoopsConfig"]['adminmail']);
-                        update_option("ping_sites", "http://rpc.pingomatic.com/\nhttp://ping.xoopsforge.com/");
-                        update_option("home", $site_url);
-                        update_option("siteurl", $site_url);
-                        update_option("what_to_show", "posts");
-                        update_option('default_pingback_flag', 0);
-                        $ret[] = 'The initial data was written in the data base of wordpress.<br />';
+        // make WordPress Default data  
+        if (function_exists('wp_install_defaults')){
+                wp_install_defaults($user_id);
+        } else {
+                wp_install_old_defaults($user_id);
+        }
+        
+        $ret[] = 'The first sample post & comment was written.<br />';
+        
+        // Rewrite Option for Xpress
+        if (WPLANG == 'ja_EUC') {
+                $setup_charset = 'EUC-JP';
+        } elseif(WPLANG == 'ja_SJIS') {
+                $setup_charset = 'Shift_JIS';
+        } else {
+                $setup_charset = 'UTF-8';
+        }
+        update_option("blog_charset", $setup_charset);
+
+        update_option('blogname', $site_name ); 
+        update_option('blogdescription', 'WordPress for XOOPS');
+        update_option("admin_email", $GLOBALS["xoopsConfig"]['adminmail']);
+        update_option("ping_sites", "http://rpc.pingomatic.com/\nhttp://ping.xoopsforge.com/");
+        update_option("home", $site_url);
+        update_option("siteurl", $site_url);
+        update_option("what_to_show", "posts");
+        update_option('default_pingback_flag', 0);
+        $ret[] = 'The initial data was written in the data base of wordpress.<br />';
+        
+        update_option("template", "xpress_default");
+        update_option("stylesheet", "xpress_default");
+        $ret[] = 'The default theme of wordpress was set to xpress_default.<br />';
+//      update_option('uploads_use_yearmonth_folders', 1);
+        update_option('upload_path', 'wp-content/uploads');
                         
-                        update_option("template", "xpress_default");
-                        update_option("stylesheet", "xpress_default");
-                        $ret[] = 'The default theme of wordpress was set to xpress_default.<br />';
-                //      update_option('uploads_use_yearmonth_folders', 1);
-                        update_option('upload_path', 'wp-content/uploads');
-                        
-        } else {        // for WordPress MU
-                global $base,$current_site, $dirs, $wpmu_version;
-                
-                $base =  $xoops_config->mu_path_current_site;
-                $domain = $xoops_config->mu_domain_current_site;
-                $admin_email = $GLOBALS["xoopsConfig"]['adminmail'];
-                $admin_user_name = $user_name;
-                $admin_user_id = $user_id;
-                include_once($mydirpath . '/include/xpress_mu_function.php');
-                
-                do_htaccess( $xoops_config->module_path . '/htaccess.dist', $xoops_config->module_path . '/.htaccess', $base, '');
-                xpress_mu_install_defaults($domain,$base,$site_name,$admin_user_id,$admin_user_name,$admin_email);
-        }
-        
 // activate the xpressme plugin
         require_once dirname( __FILE__ ).'/xpress_active_plugin.php';