Changeset 524

Timestamp:

Mar 8, 2010, 12:43:53 PM (14 years ago)

Author:

toemon

Message:

WP3でMultiBlogに設定した際、home urlが改変されるバグ修正　Fixes #291
その他、デフォルトテーマの修正

Location:

trunk/xpressme_integration_kit

Files:

• include/add_xpress_process.php (modified) (2 diffs)
• wp-content/plugins/xpressme/include/custom_functions.php (modified) (1 diff)
• wp-content/themes/xpress_default/header.php (modified) (1 diff)

trunk/xpressme_integration_kit/include/add_xpress_process.php

@@ -8 +8 @@
 
 function safe_site_url(){
-        global $xoops_config;
+        global $xoops_config,$blog_id,$blogname;
         
         if (is_xpress_index_page_call()){
@@ -17 +17 @@
                 $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
                 $guess_url = preg_replace('|/' . $module_name . '/.*|i', '/' . $module_name, $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+                $blog_sub_path = '';
+                if (defined('MULTISITE') && MULTISITE){
+                        if ($blog_id > 1){
+                                $blog_path = '/cube_mu/modules/xpress3/toy/';
+                                $blog_sub_path = '/' .$blogname;
+                        }
+                }
+                $guess_url .= $blog_sub_path;
 
-                if(strcmp($siteurl,$module_url) !== 0) {
+                if(strcmp($siteurl,$module_url.$blog_sub_path) !== 0) {
                         if (!@fclose(@fopen($siteurl . '/xoops_version.php', "r"))){
-                                update_option('siteurl' , $module_url);
+                                update_option('siteurl' , $module_url.$blog_sub_path);
                         }
                 }
 
-                if(strcmp($guess_ur,$home) !== 0) {
+                if(strcmp($guess_url,$home) !== 0) {
                         if (@fclose(@fopen($guess_url . '/xoops_version.php', "r"))){
                                 update_option('home' , $guess_url);

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

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

trunk/xpressme_integration_kit/wp-content/themes/xpress_default/header.php

@@ -42 +42 @@
         <div class="xpress-operation-link">
                 <?php
-                        if(xpress_is_wpmu()){
+                        if(xpress_is_multiblog()){
                                 $blog_details = get_blog_details(1);
                                 $site_url = $blog_details->siteurl;