mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 05:37:32 +02:00
Code Issues Releases Wiki Activity

Added missing page title to admin-ui when custom page method in use.

Browse Source
This commit is contained in:
Cameron
2014-10-24 13:14:51 -07:00
parent 8606ee7cfe
commit ba469052ef
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e107_handlers/admin_ui.php
View File

@@ -674,6 +674,7 @@ class e_admin_response
function getTitle($namespace = 'default', $reset = false, $glue = ' ') function getTitle($namespace = 'default', $reset = false, $glue = ' ')
{ {
$content = array(); $content = array();
if(isset($this->_title[$namespace]) && is_array($this->_title[$namespace])) if(isset($this->_title[$namespace]) && is_array($this->_title[$namespace]))
{ {
$content = $this->_title[$namespace]; $content = $this->_title[$namespace];
@@ -1814,6 +1815,8 @@ class e_admin_controller
*/ */
public function addTitle($title = true, $meta = true) public function addTitle($title = true, $meta = true)
{ {
if(true === $title) if(true === $title)
{ {
$_dispatcher = $this->getDispatcher(); $_dispatcher = $this->getDispatcher();
@@ -1828,6 +1831,9 @@ class e_admin_controller
} }
$title = $res['caption']; $title = $res['caption'];
} }
// echo "<h3>".__METHOD__." - ".$title."</h3>";
// print_a($title); // print_a($title);
$this->getResponse()->appendTitle($title); $this->getResponse()->appendTitle($title);
if($meta) $this->addMetaTitle($title); if($meta) $this->addMetaTitle($title);
@@ -1952,6 +1958,7 @@ class e_admin_controller
if(method_exists($this, $actionObserverName)) if(method_exists($this, $actionObserverName))
{ {
$this->$actionObserverName(); $this->$actionObserverName();
} }
// check for triggers, not available in Ajax mode // check for triggers, not available in Ajax mode
@@ -2032,6 +2039,7 @@ class e_admin_controller
$this->setRequest($request); $this->setRequest($request);
} }
$response = $this->getResponse(); $response = $this->getResponse();
// print_a($response);
$this->_preDispatch($action); $this->_preDispatch($action);
if(null === $action) if(null === $action)
@@ -2047,6 +2055,12 @@ class e_admin_controller
e107::getMessage()->add('Action '.$actionName.' no found!', E_MESSAGE_ERROR); e107::getMessage()->add('Action '.$actionName.' no found!', E_MESSAGE_ERROR);
return $response; return $response;
} }
if($action != 'Prefs' && $action != 'Create' && $action !='Edit' && $action != 'List') // Custom Page method in use, so add the title.
{
$this->addTitle();
}
ob_start(); //catch any output ob_start(); //catch any output
$ret = $this->{$actionName}(); $ret = $this->{$actionName}();
@@ -2076,7 +2090,7 @@ class e_admin_controller
{ {
$response->appendBody($ret); $response->appendBody($ret);
} }
return $response; return $response;
} }