Changeset 451 for branches/XPressMU/xpressme_integration_kit/include/xpress_block_render.php

Timestamp:

Nov 20, 2009, 2:52:16 PM (15 years ago)

Author:

toemon

Message:

MUブランチにVer2.2.0RC1の変更内容をマージ

File:

• branches/XPressMU/xpressme_integration_kit/include/xpress_block_render.php (modified) (4 diffs)

branches/XPressMU/xpressme_integration_kit/include/xpress_block_render.php

@@ -137 +137 @@
         }
         
-        function get_block_file_path($mydirname,$file_name)
-        {
-                global $xoops_config;
-                $mydirpath = $xoops_config->xoops_root_path . '/modules/' . $mydirname;
-                $select_theme = get_xpress_theme_name($mydirname);
-                $block_file = $mydirpath . '/wp-content/themes/' . $select_theme . '/blocks/' . $file_name;
-
-                if (!file_exists($block_file))
-                        $block_file =  $xoops_config->xoops_root_path . '/modules/' .$mydirname . '/wp-content/themes/xpress_default/blocks/' . $file_name;
-                return $block_file;
-        }
         
     function xpress_block_cache_found($mydirname,$block_name)
@@ -184 +173 @@
                 if (strstr($call_url,$this_url)){                       
                         $block_theme_file = get_block_file_path($mydirname,$inc_theme_file_name);
-                        require_once $block_theme_file;
+                        require_once $block_theme_file['file_path'];
                         $block = $call_theme_function_name($options);           //The block name and the called function name should be assumed to be the same name. 
+                        if (!empty($block_theme_file['error']))
+                                $block['err_message'] = $block_theme_file['error'];
                 } else {
                         if (xpress_block_cache_found($mydirname,$cache_title. $blockID)){
@@ -227 +218 @@
 
                         $block_theme_file = get_block_file_path($mydirname,$inc_theme_file_name);
-                        require_once $block_theme_file;
+                        require_once $block_theme_file['file_path'];
                         $render = $call_theme_function_name($options);          //The block name and the called function name should be assumed to be the same name.                    
                         $render_array['block'] = $render;
                         $render_array['block']['options'] = $block->options;
+                        if (!empty($block_theme_file['error']))
+                                $render_array['block']['err_message'] = $block_theme_file['error'];
                         if (xpress_block_cache_found($mydirname,$cache_title. $blockID)){       
                                 $render_serialize = xpress_XML_serialize($render_array);
@@ -295 +288 @@
                 }
         }
-
+        
 }       
 ?>