fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

ob_start * bug fix.

Browse source
This commit is contained in:
Changwan Jun 2015-05-26 14:57:42 +09:00
parent c6b4dc866c
commit e2928534c5
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
classes/template/TemplateHandler.class.php
View file

@ -362,6 +362,7 @@ class TemplateHandler
$__Context->logged_info = Context::get('logged_info'); $__Context->logged_info = Context::get('logged_info');
} }
$level = ob_get_level();
ob_start(); ob_start();
if(substr($buff, 0, 7) == 'file://') if(substr($buff, 0, 7) == 'file://')
{ {
@ -395,7 +396,12 @@ class TemplateHandler
} }
} }
return ob_get_clean(); $contents = '';
while (ob_get_level() - $level > 0) {
$contents .= ob_get_contents();
ob_end_clean();
}
return $contents;
} }
/** /**

9
modules/page/page.view.php
View file

@ -179,6 +179,7 @@ class pageView extends page
$filepath = preg_replace('/'.$filename."$/i","",$cache_file); $filepath = preg_replace('/'.$filename."$/i","",$cache_file);
$cache_file = FileHandler::getRealPath($cache_file); $cache_file = FileHandler::getRealPath($cache_file);
$level = ob_get_level();
// Verify cache // Verify cache
if($caching_interval <1 || !file_exists($cache_file) || filemtime($cache_file) + $caching_interval*60 <= $_SERVER['REQUEST_TIME'] || filemtime($cache_file)<filemtime($target_file)) if($caching_interval <1 || !file_exists($cache_file) || filemtime($cache_file) + $caching_interval*60 <= $_SERVER['REQUEST_TIME'] || filemtime($cache_file)<filemtime($target_file))
{ {
@ -208,9 +209,13 @@ class pageView extends page
ob_start(); ob_start();
include($cache_file); include($cache_file);
$content = ob_get_clean();
return $content; $contents = '';
while (ob_get_level() - $level > 0) {
$contents .= ob_get_contents();
ob_end_clean();
}
return $contents;
} }
function _replacePath($matches) function _replacePath($matches)