Merge branch '3.8RC'3.8

1 files changed, 25 insertions, 7 deletions

diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php
index fb551e36f..c4db0ef3e 100644
--- a/Zotlabs/Web/Router.php
+++ b/Zotlabs/Web/Router.php
@@ -2,6 +2,7 @@
 
 namespace Zotlabs\Web;
 
+use Zotlabs\Extend\Route;
 use Exception;
 
 /**
@@ -52,14 +53,31 @@ class Router {
 			 * First see if we have a plugin which is masquerading as a module.
 			 */
 
-			if(is_array(\App::$plugins) && in_array($module,\App::$plugins) && file_exists("addon/{$module}/{$module}.php")) {
-				include_once("addon/{$module}/{$module}.php");
-				if(class_exists($modname)) {
-					$this->controller = new $modname;
-					\App::$module_loaded = true;
+			$routes = Route::get();
+			if($routes) {
+				foreach($routes as $route) {
+					if(is_array($route) && strtolower($route[1]) === $module) {
+						include_once($route[0]);
+						if(class_exists($modname)) {
+							$this->controller = new $modname;
+							\App::$module_loaded = true;
+						}
+					}
 				}
-				elseif(function_exists($module . '_module')) {
-					\App::$module_loaded = true;
+			}
+
+			// legacy plugins - this can be removed when they have all been converted
+
+			if(! (\App::$module_loaded)) {
+				if(is_array(\App::$plugins) && in_array($module,\App::$plugins) && file_exists("addon/{$module}/{$module}.php")) {
+					include_once("addon/{$module}/{$module}.php");
+					if(class_exists($modname)) {
+						$this->controller = new $modname;
+						\App::$module_loaded = true;
+					}
+					elseif(function_exists($module . '_module')) {
+						\App::$module_loaded = true;
+					}
 				}
 			}