Changeset 451 for branches/XPressMU/xpressme_integration_kit/include/xpress_render.php

Timestamp:

Nov 20, 2009, 2:52:16 PM (14 years ago)

Author:

toemon

Message:

MUブランチにVer2.2.0RC1の変更内容をマージ

File:

• branches/XPressMU/xpressme_integration_kit/include/xpress_render.php (modified) (6 diffs)

branches/XPressMU/xpressme_integration_kit/include/xpress_render.php

@@ -11 +11 @@
 
         $pattern = "<head[^>]*?>(.*)<\/head>";
-        preg_match("/".$pattern."/s",  $body_cut, $head_matches);
-        $head_str = $head_matches[1];
-        
+        $head_str = '';
+        if (preg_match("/".$pattern."/s",  $body_cut, $head_matches)){
+                $head_str = $head_matches[1];
+        }
         $pattern = '<head[^>]*?>';
         $head_str = preg_replace("/".$pattern."/s" , '' , $head_str);
@@ -51 +52 @@
 {
         $pattern = '<title[^>]*?>(.*)<\s*\/\s*title\s*>';
-        preg_match("/".$pattern."/i",  $contents, $head_matches);
-        $title_str = $head_matches[1];
+        $title_str = '';
+        if (preg_match("/".$pattern."/i",  $contents, $head_matches)){
+                $title_str = $head_matches[1];
+        }
         return $title_str;
 }
@@ -59 +62 @@
 {
         $pattern = '<\s*meta\s+name\s*=\s*["\']' . $name . '["\']\s*content\s*=\s*[\'"](.*)[\'"]\s*\/\s*>';
-        preg_match("/".$pattern."/i",  $contents, $head_matches);
-        $meta = $head_matches[1];
+        $meta = '';
+        if (preg_match("/".$pattern."/i",  $contents, $head_matches)){
+                $meta = @$head_matches[1];
+        }
         return $meta;
 }
@@ -89 +94 @@
         $xpess_config = new XPressME_Class();
         $pattern = "<body[^>]*?>(.*)<\/body>";
-        preg_match("/".$pattern."/s",  $contents, $body_matches);
-        $body = $body_matches[1];
-
+        $body = '';
+        if(preg_match("/".$pattern."/s",  $contents, $body_matches)){
+                $body = $body_matches[1];
+        }
         if (!$xpess_config->is_theme_sidebar_disp){
                 $side_panel = get_sidebar_rander();
@@ -151 +157 @@
         
         require_once( ABSPATH .'/include/xpress_breadcrumbs.php' );
-        
+        $xoops_breadcrumbs = get_breadcrumbs();
+
         xpress_remake_global_for_permlink();
         $mydirname = basename(dirname(dirname(__FILE__)));
         include $xoops_config->xoops_root_path ."/header.php";
+        $xoopsTpl->assign('xoops_breadcrumbs', $xoops_breadcrumbs);
         $xoopsTpl->assign('xoops_module_header', get_xpress_module_header($contents));
         $page_title = $GLOBALS["xoopsModule"]->getVar("name"). ' &raquo;'. get_xpress_title($contents);
@@ -216 +224 @@
         $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'];
-        $xpress_data['right_post_link'] = $GLOBALS['right_arrow_post_link'];
+        $xpress_data['left_post_link'] = @$GLOBALS['left_arrow_post_link'];
+        $xpress_data['right_post_link'] = @$GLOBALS['right_arrow_post_link'];
         $xpress_data['left_posts_link'] =  str_replace('&laquo;','',xpress_left_arrow_posts_link('echo=0'));
         $xpress_data['right_posts_link'] = str_replace('&raquo;','',xpress_right_arrow_posts_link('echo=0'));