1.4.5.2 modified source merge to 1.5.0

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8276 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-04-06 07:56:37 +00:00
commit 52f37ded17
24 changed files with 138 additions and 125 deletions

View file

@ -18,6 +18,7 @@ class pageMobile extends ModuleObject {
if($mtime + $interval*60 > time()) {
$page_content = FileHandler::readFile($cache_file);
$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
} else {
$oWidgetController = &getController('widget');
$page_content = $oWidgetController->transWidgetCode($this->module_info->mcontent);

View file

@ -35,6 +35,7 @@
if($mtime + $interval*60 > time()) {
$page_content = FileHandler::readFile($cache_file);
$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
} else {
$oWidgetController = &getController('widget');
$page_content = $oWidgetController->transWidgetCode($this->module_info->content);