Merge branch 'master' into dev
This commit is contained in:
commit
381cc3e6f8
@ -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");
|
include_once("addon/{$module}/{$module}.php");
|
||||||
if(function_exists($module . '_module'))
|
if(function_exists($module . '_module'))
|
||||||
\App::$module_loaded = true;
|
\App::$module_loaded = true;
|
||||||
|
@ -1 +1 @@
|
|||||||
2016-04-01.1353H
|
2016-04-02.1354H
|
||||||
|
Reference in New Issue
Block a user