Changeset 848 for trunk/xpressme_integration_kit

Timestamp:

Nov 18, 2013, 9:29:23 AM (11 years ago)

Author:

toemon

Message:

XCL 2.2.1 メインメニューブロックにおいて、サブメニューが表示されない問題修正　fixed #426
thx nao-pon

File:

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

trunk/xpressme_integration_kit/include/xpress_render.php

@@ -1 +1 @@
 <?php
 
-//< style >< script >< link > tag is pulled out from the header of html contents. 
+//< style >< script >< link > tag is pulled out from the header of html contents.
 function get_mod_header($contents)
 {
         global $xpress_config;
-        
+
         $pattern = "<body[^>]*?>(.*)<\/body>";
         $body_cut = preg_replace("/".$pattern."/s" , '' , $contents);
@@ -36 +36 @@
         $head_str = meta_name_cut('generator',$head_str);
 
-        $head_str = preg_replace("/^(\s)*(\r|\n|\r\n)/m", "", $head_str);       
+        $head_str = preg_replace("/^(\s)*(\r|\n|\r\n)/m", "", $head_str);
         $pattern = "^";
         $head_str = preg_replace("/".$pattern."/m" , "\t" , $head_str);
@@ -71 +71 @@
 }
 
-// get sidebar rendaring 
+// get sidebar rendaring
 function get_sidebar_rander($name = null)
 {
@@ -93 +93 @@
 }
 
-// < body > tag is pulled out from the header of html contents. 
+// < body > tag is pulled out from the header of html contents.
 function get_body($contents)
 {
@@ -103 +103 @@
                 $body = $body_matches[1];
         }
-        
+
         if ($xpess_config->is_theme_sidebar_disp){
                 $xpress_class = 'xpress-body';
@@ -109 +109 @@
                 $xpress_class = 'xpress-body onecolumn';
         }
-        
+
         $pattern = '<body\s*([^>]*)>';
         $body_class = 'class="' . $xpress_class . '"';
@@ -115 +115 @@
                 $body_tag_option = $body_matches[1];
 
-                $pattern = 'class\s*=\s*[\'|"]([^\'|^"]*)[\'|"]';               
+                $pattern = 'class\s*=\s*[\'|"]([^\'|^"]*)[\'|"]';
                 if(preg_match("/".$pattern."/",  $body_tag_option, $class_matches)){
                         $class_value = $class_matches[1];
@@ -142 +142 @@
                 $preload_make_module_header = '';
         }
-        
+
         if (! empty($preload_make_module_header)){
         $preload_make_module_header = '<!-- preload added module header -->
@@ -148 +148 @@
 ';
         }
-        
+
         $wp_module_header = '<!-- wordpress  added module header -->
 ' . get_mod_header($contents) . '
@@ -193 +193 @@
                 $xoTheme->addMeta('meta', $meta_key, $meta_word);
                 }
-                $xoopsTpl->assign('xoops_meta_'.  $meta_key, $meta_word);                               
-        }       
+                $xoopsTpl->assign('xoops_meta_'.  $meta_key, $meta_word);
+        }
 }
 function xpress_get_xoops_meta($meta_key){
         global $xoopsTpl,$xoTheme; //for XOOPS
-        
+
         if (defined('LEGACY_MODULE_VERSION') && version_compare(LEGACY_MODULE_VERSION, '2.2', '>=')) {
                 // For XCL 2.2
@@ -213 +213 @@
         return $ret;
 }
-        
+
 
 //rendering for the module header and the body
@@ -219 +219 @@
         global $xoops_config;
         global $xoopsUser , $xoopsTpl,$xpress_config , $xoopsModule , $xoopsLogger, $xoopsConfig ; //for XOOPS
-        
+
         //disable cache
         $xoopsConfig['module_cache'][$xoopsModule->getVar('mid')] = 0;
@@ -228 +228 @@
         xpress_remake_global_for_permlink();
         $mydirname = basename(dirname(dirname(__FILE__)));
+        if (defined('LEGACY_BASE_VERSION') && version_compare(LEGACY_BASE_VERSION, '2.2.1.1', '>=')) {
+                $module_handler =& xoops_gethandler('module');
+                $thisModule =& $module_handler->getByDirname($mydirname);
+                $thisModule->modinfo = null;
+        }
         include $xoops_config->xoops_root_path ."/header.php";
         $xoopsTpl->assign('xoops_breadcrumbs', $xoops_breadcrumbs);
@@ -233 +238 @@
         $page_title = $GLOBALS["xoopsModule"]->getVar("name"). ' &raquo;'. get_xpress_title($contents);
         $xoopsTpl->assign('xoops_pagetitle', $page_title);
-        
+
         $xoops_keywords =  xpress_get_xoops_meta('keywords');
-        
+
         $wp_keyword = get_xpress_meta_name('keywords',$contents);
         switch ($xpress_config->meta_keyword_type){
@@ -253 +258 @@
                                 }
                                 xpress_meta_assign('keywords', $keywords);
-                        } 
+                        }
                         break;
                 default :
@@ -277 +282 @@
                                 }
                                 xpress_meta_assign('description', $description);
-                        } 
+                        }
                         break;
                 default :
@@ -305 +310 @@
         $xpress_data['now_user_level'] = xpress_now_user_level('echo=0');
 
-        //If notification_select.php is not executed in CMS other than XCL, the selector of in-line is not displayed. 
+        //If notification_select.php is not executed in CMS other than XCL, the selector of in-line is not displayed.
         if (is_object($xoopsModule) && $xoopsModule->getVar('hasnotification') == 1 && is_object($xoopsUser)) {
                 require_once $xoops_config->xoops_root_path . '/include/notification_select.php';
         }
-        
+
         $xoopsTpl->assign('xpress', $xpress_data);
         $templates_file = 'db:'.$mydirname. '_index.html';