@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | * |
| 73 | 73 | * @param $module |
| 74 | 74 | * |
| 75 | - * @return bool True if module related to SamsonCMS |
|
| 75 | + * @return integer True if module related to SamsonCMS |
|
| 76 | 76 | */ |
| 77 | 77 | public function ifModuleRelated($module) |
| 78 | 78 | { |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | * |
| 109 | 109 | * @param array $params Initialization parameters |
| 110 | 110 | * |
| 111 | - * @return bool Initialization stage result |
|
| 111 | + * @return boolean|null Initialization stage result |
|
| 112 | 112 | */ |
| 113 | 113 | public function init(array $params = array()) |
| 114 | 114 | { |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | |
| 129 | 129 | // Generate resources for new module |
| 130 | 130 | //[PHPCOMPRESSOR(remove,start)] |
| 131 | - $this->system->module('resourcer')->generateResources($this->moduleList, $this->path() . 'app/view/index.php'); |
|
| 131 | + $this->system->module('resourcer')->generateResources($this->moduleList, $this->path().'app/view/index.php'); |
|
| 132 | 132 | //[PHPCOMPRESSOR(remove,end)] |
| 133 | 133 | } |
| 134 | 134 | |
@@ -140,12 +140,12 @@ discard block |
||
| 140 | 140 | public function activeModuleHandler($module) |
| 141 | 141 | { |
| 142 | 142 | // Define if routed module is related to SamsonCMS |
| 143 | - if($this->isCMS = $this->ifModuleRelated($module)){ |
|
| 143 | + if ($this->isCMS = $this->ifModuleRelated($module)) { |
|
| 144 | 144 | // TODO: This should be removed - Reparse url |
| 145 | 145 | url()->parse(); |
| 146 | 146 | |
| 147 | 147 | // Switch template to SamsonCMS |
| 148 | - $this->system->template($this->path() . 'app/view/index.php', true); |
|
| 148 | + $this->system->template($this->path().'app/view/index.php', true); |
|
| 149 | 149 | |
| 150 | 150 | Event::fire(self::EVENT_IS_CMS, array(&$this)); |
| 151 | 151 | } |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | public function updateCMSPrefix($module, &$prefix) |
| 161 | 161 | { |
| 162 | 162 | if (($module->id != $this->id) && $this->ifModuleRelated($module)) { |
| 163 | - $prefix = '/' . $this->baseUrl . $prefix; |
|
| 163 | + $prefix = '/'.$this->baseUrl.$prefix; |
|
| 164 | 164 | } |
| 165 | 165 | } |
| 166 | 166 | |
@@ -258,7 +258,6 @@ discard block |
||
| 258 | 258 | $local = m('local'); |
| 259 | 259 | $current = m(); |
| 260 | 260 | |
| 261 | - return isset($current['title']) ? $current['title'] : |
|
| 262 | - (isset($local['title']) ? $local['title'] : ''); |
|
| 261 | + return isset($current['title']) ? $current['title'] : (isset($local['title']) ? $local['title'] : ''); |
|
| 263 | 262 | } |
| 264 | 263 | } |