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

Fixes #1186 - Added edit button for custom pages. Improved debugging of shortcodes and shortcode wrappers.

Browse Source
This commit is contained in:
Cameron
2016-04-02 10:51:18 -07:00
parent ec3e92b0d6
commit 46b2518e82
5 changed files with 78 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
page.php
View File

@@ -103,6 +103,7 @@ class pageClass
public $pageOutput = array(); // Output storage - text and caption
protected $renderMode; // Page render mode to be used on view page
protected $templateID = null;
function __construct($debug=FALSE)
{
@@ -578,8 +579,8 @@ class pageClass
$this->template = e107::getCoreTemplate('page', 'default');
// $this->batch = e107::getScBatch('page',null,'cpage')->setVars(new e_vars($ret))->setScVar('page', array()); ///Upgraded to setVars() array. (not using '$this->page')
$this->batch = e107::getScBatch('page',null,'cpage')->setVars($this->page);
$this->batch = e107::getScBatch('page',null,'cpage')->setVars($this->page)->wrapper('page/'.$this->templateID);
define("e_PAGETITLE", $this->page['page_title']);
@@ -589,21 +590,27 @@ class pageClass
$this->page = $sql->fetch();
// setting override to true breaks default.
$this->template = e107::getCoreTemplate('page', vartrue($this->page['page_template'], 'default'), true, true);
// setting override to true breaks default.
$this->templateID = vartrue($this->page['page_template'], 'default');
$this->template = e107::getCoreTemplate('page', $this->templateID, true, true);
if(!$this->template)
{
// switch to default
$this->template = e107::getCoreTemplate('page', 'default', false, false);
$this->templateID = 'default';
}
if(empty($this->template))
{
$this->template = e107::getCoreTemplate('page', 'default');
$this->templateID = 'default';
}
$this->batch = e107::getScBatch('page',null,'cpage');
$this->batch->wrapper('page/'.$this->templateID );
$this->pageText = $this->page['page_text'];
@@ -804,7 +811,7 @@ class pageClass
public function renderPage($template, $vars = null)
{
if(null === $vars)
{
$ret = e107::getParser()->parseTemplate($template, true, $this->batch);