mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-07 15:16:30 +02:00
Code Issues Releases Wiki Activity

Fix custom page batch data overridden by custom menu (when menu is rendered before the page)

Browse Source
This commit is contained in:
SecretR
2014-07-10 13:36:58 +03:00
parent f9f6197cad
commit 32afe1f2a0
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
page.php
View File

@@ -59,10 +59,11 @@ else
{ {
$e107CorePage->setRequest('showPage'); $e107CorePage->setRequest('showPage');
$e107CorePage->processViewPage(); $e107CorePage->processViewPage();
$e107CorePage->setPage();
require_once(HEADERF); require_once(HEADERF);
echo $e107CorePage->showPage(); echo $e107CorePage->pageOutput['text'];
require_once(FOOTERF); require_once(FOOTERF);
exit; exit;
@@ -679,7 +680,7 @@ class pageClass
return str_replace('[[PAGECOMMENTS]]', $comments, $this->cacheData['PAGE']); return str_replace('[[PAGECOMMENTS]]', $comments, $this->cacheData['PAGE']);
} }
public function showPage() public function setPage()
{ {
@@ -709,7 +710,9 @@ class pageClass
if($vars->cachecontrol) $this->setCache($ret, $this->batch->sc_cpagetitle(), $this->page['page_comment_flag']); if($vars->cachecontrol) $this->setCache($ret, $this->batch->sc_cpagetitle(), $this->page['page_comment_flag']);
return str_replace('[[PAGECOMMENTS]]', $this->batch->cpagecomments(), $ret); //return str_replace('[[PAGECOMMENTS]]', $this->batch->cpagecomments(), $ret);
$this->pageOutput = array('text' => str_replace('[[PAGECOMMENTS]]', $this->batch->cpagecomments(), $ret));
return;
} }
$extend = new e_vars; $extend = new e_vars;
@@ -749,7 +752,8 @@ class pageClass
break; break;
} }
return $this->renderPage($template, $extend); // return $this->renderPage($template, $extend);
$this->pageOutput = array('text' => $this->renderPage($template, $extend));
} }
public function renderPage($template, $vars = null) public function renderPage($template, $vars = null)