Changeset 531 for trunk/xpressme_integration_kit/wp-content/plugins

Timestamp:

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

Author:

toemon

Message:

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

Location:

trunk/xpressme_integration_kit/wp-content/plugins/xpressme

Files:

• include/custom_functions.php (modified) (1 diff)
• xpressme.php (modified) (1 diff)
• xpressme_class.php (modified) (2 diffs)

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

@@ -41 +41 @@
 }
 
-function xpress_is_wpmu() {
-        global $xoops_config;
-        
-        return $xoops_config->is_wpmu;
-}
-
 function xpress_is_multiblog() {
         global $xoops_config;
         
         if (defined('MULTISITE')) return MULTISITE;
-        return $xoops_config->multiblog;
+        return false;
 }
 

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php

@@ -213 +213 @@
                 echo                    '<table class="form-table">'."\n";
                 $upload_title = __('Media Upload Base Path','xpressme');
-                if($xoops_config->is_wpmu) $upload_title = $upload_title . '(WPMU is not select)';
+                if(xpress_is_multiblog()) $upload_title = $upload_title . '(MultiBlog is not select)';
                 echo                            $xpress_config->yes_no_radio_option('is_use_xoops_upload_path',
                                                                                                 $upload_title,
                                                                                                 __('Use XOOPS UPLOAD PATH','xpressme'),
                                                                                                 __('USE WordPress BASE_PATH','xpressme'),
-                                                                                                $xoops_config->is_wpmu
+                                                                                                xpress_is_multiblog()
                                                                                                 );
                 $lock = ($xoops_config->module_url != get_bloginfo('url'));

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php

@@ -303 +303 @@
 
                 global $xoops_config;
-                if($xoops_config->is_wpmu) $this->is_use_xoops_upload_path = false;
+                if(xpress_is_multiblog()) $this->is_use_xoops_upload_path = false;
 
                 $table = get_wp_prefix() . 'group_role';        
@@ -584 +584 @@
                         $selected = '';
                 
-                if ($xoops_config->is_wpmu) {
-                        $forum_list .= '<option value="none"' . $selected . '>' . __('WordPress MU cannot integrate the comments.', 'xpressme') . "</option>\n";
+                if (xpress_is_multiblog()) {
+                        $forum_list .= '<option value="none"' . $selected . '>' . __('WordPress MultiBlog cannot integrate the comments.', 'xpressme') . "</option>\n";
                 } else {        
                         $forum_list .= '<option value="none"' . $selected . '>' . __('Do Not Comment Integration.', 'xpressme') . "</option>\n";