aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-04-03 00:04:30 +0200
committerMario Vavti <mario@mariovavti.com>2016-04-03 00:04:30 +0200
commite361ee9253d0a235a6b54fae1a1d6a25a6541342 (patch)
treec3848ec9ed5e85df6bef40fc4da1b17c50f1ec18
parent3edd4ce78fcf6a5384ec503249c4e1f0fb6143ff (diff)
parentd09694587d15ce093149cc2321a63b9923554345 (diff)
downloadvolse-hubzilla-e361ee9253d0a235a6b54fae1a1d6a25a6541342.tar.gz
volse-hubzilla-e361ee9253d0a235a6b54fae1a1d6a25a6541342.tar.bz2
volse-hubzilla-e361ee9253d0a235a6b54fae1a1d6a25a6541342.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla
-rw-r--r--Zotlabs/Web/Router.php2
-rw-r--r--version.inc2
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