Changeset 672

Timestamp:

Nov 30, 2010, 1:22:19 AM (14 years ago)

Author:

toemon

Message:

設定したWordPressテーマを削除したとき無くなったときFatal errorになるバグを修正 ref#384

File:

• trunk/xpressme_integration_kit/include/xpress_render.php (modified) (2 diffs)

trunk/xpressme_integration_kit/include/xpress_render.php

@@ -81 +81 @@
 
         $link= locate_template($templates, false);
-        if ('' == $link)
-                $link =  get_theme_root() . '/default/sidebar.php';
-
-        ob_start();
-                require($link);
-                $sidebar = ob_get_contents();
-        ob_end_clean();
-        return $sidebar;
+        if ('' == $link){
+//              $link =  get_theme_root() . '/default/sidebar.php';
+                return '';
+        } else {
+                ob_start();
+                        require($link);
+                        $sidebar = ob_get_contents();
+                ob_end_clean();
+                return $sidebar;
+        }
 }
 
@@ -248 +250 @@
                 default :
         }
-        
-        $xpress_data['body_contents'] = get_body($contents);
+        if (empty($contents)){
+                $template_name = get_option('template');
+                $xpress_data['body_contents'] = "<p>Themes \"$template_name\" is broken or doesn't exist. </p><p>Please choose the right theme from the admin page of wordpress.</p>";
+        } else {
+                $xpress_data['body_contents'] = get_body($contents);
+        }
         // used $GLOBALS. becose xpress_left_arrow_post_link() and xpress_right_arrow_post_link() is other loop in this position
         $xpress_data['left_post_link'] = @$GLOBALS['left_arrow_post_link'];