Changeset 394 for trunk

Timestamp:

Oct 7, 2009, 8:21:37 PM (15 years ago)

Author:

toemon

Message:

ブロックのキャッシュをモジュール外に表示設定を行っているブロックだけに絞り込んで、余計なキャッシュを作成しないようにする。 Fixes #208

File:

• trunk/xpressme_integration_kit/include/xpress_block_render.php (modified) (1 diff)

trunk/xpressme_integration_kit/include/xpress_block_render.php

@@ -206 +206 @@
                 global $xoops_db;
                 $mid = get_xpress_modid();
-                $sql = "SELECT bid,options,func_file FROM " . get_xoops_prefix() . "newblocks WHERE mid = $mid AND visible = 1";
+                
+                // It is a block that needs cache arranged outside the module. 
+                // Only the block arranged outside the module is detected here.
+                $newblocks = get_xoops_prefix() . "newblocks";
+                $block_module_link = get_xoops_prefix(). "block_module_link";
+                $sql  = "SELECT * FROM $newblocks LEFT JOIN $block_module_link ON {$newblocks}.bid = {$block_module_link}.block_id ";
+                $sql .= "WHERE {$newblocks}.mid = $mid AND {$newblocks}.visible = 1 AND {$block_module_link}.module_id != $mid ";
+                $sql .= "GROUP BY {$newblocks}.bid";
+
                 $blocks = $xoops_db->get_results($sql);
                 require_once get_xpress_dir_path() . '/include/xpress_block_render.php';