Changeset 172

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が発生するバグ修正

Location:

trunk

Files:

• include/xpress_block_render.php (modified) (6 diffs)
• wp-config.php (modified) (1 diff)
• xoops_version.php (modified) (2 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 @@
         } 
     } 
-        
+}       
 ?>

trunk/wp-config.php

@@ -101 +101 @@
         // This Function in xpressme plugin
         require_once( ABSPATH .'/include/xpress_block_render.php' );    
-        xpress_unnecessary_block_cache_delete();
-        if (is_home()) xpress_block_cache_refresh();
+        xpress_unnecessary_block_cache_delete($xoops_config->module_name);
+        if (is_home()) xpress_block_cache_refresh($xoops_config->module_name);
         exit();         // The return to wp-blog-header.php is stolen here
 }

trunk/xoops_version.php

@@ -31 +31 @@
 $modversion['name'] = ucfirst($mydirname) . ' ' . constant('_MI_XPRESS_NAME') ;
 $modversion['description'] = constant( '_MI_XPRESS_DESC');
-$modversion['version'] = "0.30";
+$modversion['version'] = "0.31";
 $modversion['credits'] = "Wordpress DEV (http://wordpress.org/) XPressME DEV Toemon) (http://www.toemon.com) ;";
 $modversion['author'] = "toemon (http://www.toemon.com)";
@@ -40 +40 @@
 
 // status
-$modversion['codename'] = "r170";
+$modversion['codename'] = "r172";
 
 // onInstall, onUpdate, onUninstall