Merge pull request #6806 from MrPetovan/bug/6805-restore-module-custom-titles
Restore module custom title display
This commit is contained in:
commit
95f27524ab
12
src/App.php
12
src/App.php
|
@ -570,14 +570,14 @@ class App
|
||||||
$interval = 40000;
|
$interval = 40000;
|
||||||
}
|
}
|
||||||
|
|
||||||
// compose the page title from the sitename and the
|
// Default title: current module called
|
||||||
// current module called
|
if (empty($this->page['title']) && $this->module) {
|
||||||
if (!$this->module == '') {
|
$this->page['title'] = ucfirst($this->module);
|
||||||
$this->page['title'] = $this->config->get('config', 'sitename') . ' (' . $this->module . ')';
|
|
||||||
} else {
|
|
||||||
$this->page['title'] = $this->config->get('config', 'sitename');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Prepend the sitename to the page title
|
||||||
|
$this->page['title'] = $this->config->get('config', 'sitename', '') . (!empty($this->page['title']) ? ' | ' . $this->page['title'] : '');
|
||||||
|
|
||||||
if (!empty(Core\Renderer::$theme['stylesheet'])) {
|
if (!empty(Core\Renderer::$theme['stylesheet'])) {
|
||||||
$stylesheet = Core\Renderer::$theme['stylesheet'];
|
$stylesheet = Core\Renderer::$theme['stylesheet'];
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue