Changeset 540

Timestamp:

Mar 14, 2010, 12:54:49 AM (15 years ago)

Author:

toemon

Message:

投稿後のブロックのキャッシュリフレッシュでエラーが発生するバグ修正 Fixes #304

Location:

trunk/xpressme_integration_kit/wp-content

Files:

• plugins/xpressme/include/xpress_common_functions.php (modified) (1 diff)
• themes/xpress_default/blocks/blog_list_block_theme.php (modified) (1 diff)
• themes/xpress_default/blocks/global_recent_posts_list_block_theme.php (modified) (1 diff)

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

@@ -137 +137 @@
         require_once get_xpress_dir_path() . '/include/xpress_block_render.php'; 
 
-
         foreach($blocks as $block){ 
                 $func_file = $block->func_file; 
+                
+                // Avoid the failure of the operation when switch_to_blog() and other plugin code is called on the admin page.
+                $excludes = '|global_recent_posts_list_block.php|my_.*_block.php|';
+                if (preg_match('/' . $excludes . '/' , $func_file)) continue;
+                
                 $call_theme_function_name = str_replace(".php", "", $func_file); 
                 $inc_theme_file_name = str_replace(".php", "", $func_file) . '_theme.php'; 

trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/blog_list_block_theme.php

@@ -3 +3 @@
 function blog_list_block($options)
 {
-        if(is_admin()) return; // wp-admin page is not exists
         $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
         $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_category.html' : trim( $options[1] );

trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/global_recent_posts_list_block_theme.php

@@ -3 +3 @@
 function global_recent_posts_list_block($options)
 {
-        if (is_admin()) return;
         $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
         $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_recent_posts_list_block.html' : trim( $options[1] );