Merge branch 'master' into dev

2016-04-02 13:54:49 -07:00 · 2016-04-02 13:54:49 -07:00 · 381cc3e6f8
commit 381cc3e6f8
parent 63451db3f6 d09694587d
2 changed files with 2 additions and 2 deletions
--- a/Zotlabs/Web/Router.php
+++ b/Zotlabs/Web/Router.php
@ -36,7 +36,7 @@ class Router {
 			 *
 			 */

-			if(is_array(\App::$plugins) && in_array(\App::$module,\App::$plugins) && file_exists("addon/{$module}/{\$module}.php")) {
+			if(is_array(\App::$plugins) && in_array($module,\App::$plugins) && file_exists("addon/{$module}/{$module}.php")) {
 				include_once("addon/{$module}/{$module}.php");
 				if(function_exists($module . '_module'))
 					\App::$module_loaded = true;
--- a/version.inc
+++ b/version.inc
@ -1 +1 @@
-2016-04-01.1353H
+2016-04-02.1354H