@@ -36,9 +36,9 @@ discard block |
||
36 | 36 | Event::subscribe('samsonphp.router.create.module.routes', array($this, 'updateCMSPrefix')); |
37 | 37 | |
38 | 38 | //[PHPCOMPRESSOR(remove,start)] |
39 | - $moduleList = $this->system->module_stack; |
|
39 | + $moduleList = $this->system->module_stack; |
|
40 | 40 | foreach ($this->system->module_stack as $id => $module) { |
41 | - if ( ! (isset($module->composerParameters['composerName']) && |
|
41 | + if (!(isset($module->composerParameters['composerName']) && |
|
42 | 42 | isset($this->composerParameters['required']) && |
43 | 43 | in_array($module->composerParameters['composerName'], $this->composerParameters['required'])) |
44 | 44 | ) { |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | // Generate resources for new module |
52 | - $this->system->module('resourcer')->generateResources($moduleList, $this->path() . 'app/view/index.php'); |
|
52 | + $this->system->module('resourcer')->generateResources($moduleList, $this->path().'app/view/index.php'); |
|
53 | 53 | //[PHPCOMPRESSOR(remove,end)] |
54 | 54 | |
55 | 55 | // Call parent initialization |
@@ -59,12 +59,12 @@ discard block |
||
59 | 59 | public function activeModuleHandler($module) |
60 | 60 | { |
61 | 61 | // Define if routed module is related to SamsonCMS |
62 | - if($this->isCMS = $this->ifModuleRelated($module)){ |
|
62 | + if ($this->isCMS = $this->ifModuleRelated($module)) { |
|
63 | 63 | // TODO: This should be removed - Reparse url |
64 | 64 | url()->parse(); |
65 | 65 | |
66 | 66 | // Switch template to SamsonCMS |
67 | - $this->system->template($this->path() . 'app/view/index.php', true); |
|
67 | + $this->system->template($this->path().'app/view/index.php', true); |
|
68 | 68 | } |
69 | 69 | } |
70 | 70 | |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | public function updateCMSPrefix($module, &$prefix) |
78 | 78 | { |
79 | 79 | if (($module->id != $this->id) && $this->ifModuleRelated($module)) { |
80 | - $prefix = '/' . $this->baseUrl . $prefix; |
|
80 | + $prefix = '/'.$this->baseUrl.$prefix; |
|
81 | 81 | } |
82 | 82 | } |
83 | 83 | |
@@ -169,7 +169,6 @@ discard block |
||
169 | 169 | $local = m('local'); |
170 | 170 | $current = m(); |
171 | 171 | |
172 | - return isset($current['title']) ? $current['title'] : |
|
173 | - (isset($local['title']) ? $local['title'] : ''); |
|
172 | + return isset($current['title']) ? $current['title'] : (isset($local['title']) ? $local['title'] : ''); |
|
174 | 173 | } |
175 | 174 | } |