1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 12:20:44 +02:00

Fix core merge template arrays issue (fixes page templates issue as well)

This commit is contained in:
SecretR
2013-10-16 18:46:41 +03:00
parent 892bf211e4
commit 0f7c5b0a50
2 changed files with 15 additions and 13 deletions

View File

@@ -395,9 +395,14 @@ class pageClass
$this->page = $sql->fetch();
$this->template = e107::getCoreTemplate('page', vartrue($this->page['page_template'], 'default'), false, true); // setting override to true breaks default.
// $this->template = e107::getCoreTemplate('page', 'default',true,true);
// print_a($this->template);
// setting override to true breaks default.
$this->template = e107::getCoreTemplate('page', vartrue($this->page['page_template'], 'default'), true, true);
if(!$this->template)
{
// switch to default
$this->template = e107::getCoreTemplate('page', 'default', false, false);
}
if(empty($this->template))
{
$this->template = e107::getCoreTemplate('page', 'default');