Changeset 172 for trunk/include/xpress_block_render.php

Timestamp:

Apr 10, 2009, 2:40:40 AM (16 years ago)

Author:

toemon

Message:

Bump Ver0.31 #102 モジュールを複製使用したときinclude\xpress_block_render.phpないの関数群でCannot redeclareが発生するバグ修正

File:

• trunk/include/xpress_block_render.php (modified) (6 diffs)

trunk/include/xpress_block_render.php

@@ -1 +1 @@
 <?php
+if(!defined('XPRESS_BLOCK_RENDER_FUNCTION_READ')){
+        define('XPRESS_BLOCK_RENDER_FUNCTION_READ',1);
         require_once dirname( __FILE__ ) .'/xml.php' ;
         require_once dirname( __FILE__ ) .'/xpress_cache.php' ;
@@ -190 +192 @@
         }
         
-        function xpress_block_cache_refresh()
+        function xpress_block_cache_refresh($mydirname)
         {
                 global $xoops_db;
@@ -196 +198 @@
                 $sql = "SELECT bid,options,func_file FROM " . get_xoops_prefix() . "newblocks WHERE mid = $mid AND visible = 1";
                 $blocks = $xoops_db->get_results($sql);
-                $mydirname = get_xpress_dir_name();
                 require_once get_xpress_dir_path() . '/include/xpress_block_render.php';
 
@@ -228 +229 @@
         }
         
-        function xpress_unnecessary_block_cache_delete()
+        function xpress_unnecessary_block_cache_delete($mydirname)
         {
                 global $xoops_db,$xoops_config;
@@ -234 +235 @@
                 $sql = "SELECT bid,options,func_file FROM " . get_xoops_prefix() . "newblocks WHERE mid = $mid AND visible = 1";
                 $blocks = $xoops_db->get_results($sql);
-                $mydirname = get_xpress_dir_name();
                 require_once get_xpress_dir_path() . '/include/xpress_block_render.php';
 
@@ -258 +258 @@
         } 
     } 
-        
+}       
 ?>