FIX: fix template path registrator

2016-09-28 00:14:18 +02:00
parent 3a0a132701
commit 5b9b5c0d38
4 changed files with 10 additions and 4 deletions
@@ -112,13 +112,16 @@ class TemplateRegistrator
        }

        foreach ($this->paths as $path) {
-            $this->setNamespace($path['namespace'] . '::');
+            if (!empty($path['namespace'])) {
+                $this->setNamespace($path['namespace'] . '::');
+            }
            $this->setModuleId($path['moduleId']);
            $this->setBaseDirectory($path['baseDirectory']);

            $this->registeredPath = $this->baseDirectory . DIRECTORY_SEPARATOR . $path['path'];
            // register path
            $this->registerPath($this->registeredPath, $path['name']);
+            $this->unsetNamespace();
        }
    }

@@ -33,6 +33,9 @@ class AdminMenuRegistrator

        // iterate over all enabled modules
        foreach ($modules as $key => $module) {
+            if (!is_callable([$module->handler, 'registerAdminMenu']))
+                continue;
+
            // try to register menus
            try {
                call_user_func([$module->handler, 'registerAdminMenu'], $user);