diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-02 13:54:49 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-02 13:54:49 -0700 |
| commit | 381cc3e6f806bc99a2c4a529c34a6e4e2de15f28 (patch) | |
| tree | 78336d9061c4a4a174eb3f862a50d598c7d4ed1d | |
| parent | 63451db3f60633ad9724500fbece04b0c0d8e71d (diff) | |
| parent | d09694587d15ce093149cc2321a63b9923554345 (diff) | |
| download | volse-hubzilla-381cc3e6f806bc99a2c4a529c34a6e4e2de15f28.tar.gz volse-hubzilla-381cc3e6f806bc99a2c4a529c34a6e4e2de15f28.tar.bz2 volse-hubzilla-381cc3e6f806bc99a2c4a529c34a6e4e2de15f28.zip | |
Merge branch 'master' into dev
| -rw-r--r-- | Zotlabs/Web/Router.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php index e2e920f39..29f2b5206 100644 --- 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; diff --git a/version.inc b/version.inc index f0fd57683..b565bc50b 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-04-01.1353H +2016-04-02.1354H |