mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 22:57:14 +02:00
Code Issues Releases Wiki Activity

Page template corrections in bootstrap.

Browse Source
This commit is contained in:
Cameron
2013-06-01 14:03:18 -07:00
parent 4776f49964
commit 7c80fc6aad
3 changed files with 80 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
page.php
View File

@@ -344,12 +344,12 @@ class pageClass
}
$sql = e107::getDb();
$query = "SELECT p.*, u.user_id, u.user_name, user_login FROM #page AS p
LEFT JOIN #user AS u ON p.page_author = u.user_id
WHERE p.page_id=".intval($this->pageID); // REMOVED AND p.page_class IN (".USERCLASS_LIST.") - permission check is done later
if(!$sql->db_Select_gen($query))
if(!$sql->gen($query))
{
$ret['title'] = LAN_PAGE_12; // ***** CHANGED
$ret['sub_title'] = '';
@@ -364,13 +364,19 @@ class pageClass
$this->batch = e107::getScBatch('page',null,'cpage')->setVars(new e_vars($ret))->setScVar('page', array());
define("e_PAGETITLE", $ret['title']);
return;
}
$this->page = $sql->db_Fetch();
$this->page = $sql->fetch();
$this->template = e107::getCoreTemplate('page', vartrue($this->page['page_template'], 'default'));
if(empty($this->template)) $this->template = e107::getCoreTemplate('page', 'default');
$this->template = e107::getCoreTemplate('page', vartrue($this->page['page_template'], 'default'), true, true);
// $this->template = e107::getCoreTemplate('page', 'default',true,true);
// print_a($this->template);
if(empty($this->template))
{
$this->template = e107::getCoreTemplate('page', 'default');
}
$this->batch = e107::getScBatch('page',null,'cpage');
@@ -454,17 +460,21 @@ class pageClass
public function showPage()
{
if(null !== $this->cacheData)
{
return $this->renderCache();
}
if(true === $this->authorized)
{
$vars = $this->batch->getParserVars();
$template = str_replace('{PAGECOMMENTS}', '[[PAGECOMMENTS]]', $this->template['start'].$this->template['body'].$this->template['end']);
$ret = $this->renderPage($template);
if(!empty($this->template['page']))
{
$ret = str_replace(array('{PAGE}', '{PAGECOMMENTS}'), array($ret, '[[PAGECOMMENTS]]'), $this->template['page']);