Changeset 541

Timestamp:

Mar 14, 2010, 1:45:25 AM (14 years ago)

Author:

toemon

Message:

拡張ブロックのコードが選択テーマに無い場合デフォルトテーマ内を探すように Fixes #305

File:

• trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/enhanced_block_theme.php (modified) (2 diffs)

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

@@ -1 +1 @@
 <?php
-// Block Version: 1.0
+// Block Version: 1.1
 function enhanced_block($options)
 {
@@ -9 +9 @@
         $include_path = dirname(__FILE__) . '/my_' . $include_file . '_block.php';
 
+        $file_found = true;
         if (empty($include_file)) {
+                $file_found = false;
                 $output = __('The include file name to display it is not set.','xpress');
-        } else if (! file_exists($include_path)) {
-                $output = sprintf(__('File %s not exist.','xpress'),$include_path);
-        } else {
+        }
+        if (! file_exists($include_path)) {
+                $include_path_temp = $include_path;
+                $include_path = dirname(dirname(dirname(__FILE__))).'/xpress_default/blocks/my_' . $include_file . '_block.php';
+                if (! file_exists($include_path)) {
+                        $file_found = false;
+                        $output = sprintf(__('File %s not exist.','xpress'),$include_path_temp);
+                }
+        }
+        if($file_found) {
                 ob_start();
                         require $include_path;