Allow plugin view & configuration files to be registered on protected…

… routes Fixes #5245
octobercms · Aug 19, 2020 · 3864e5b · 3864e5b
1 parent f295620
commit 3864e5b
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/modules/system/classes/PluginManager.php b/modules/system/classes/PluginManager.php
@@ -238,18 +238,6 @@ public function registerPlugin($plugin, $pluginId = null)
             ComposerManager::instance()->autoload($pluginPath . '/vendor');
         }
 
-        /**
-         * Disable plugin registration for restricted pages, unless elevated
-         */
-        if (self::$noInit && !$plugin->elevated) {
-            return;
-        }
-
-        /**
-         * Run the plugin's register() method
-         */
-        $plugin->register();
-
         /*
          * Register configuration path
          */
@@ -266,6 +254,18 @@ public function registerPlugin($plugin, $pluginId = null)
             View::addNamespace($pluginNamespace, $viewsPath);
         }
 
+        /**
+         * Disable plugin registration for restricted pages, unless elevated
+         */
+        if (self::$noInit && !$plugin->elevated) {
+            return;
+        }
+
+        /**
+         * Run the plugin's register() method
+         */
+        $plugin->register();
+
         /*
          * Add init, if available
          */