aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-03-23 21:44:55 -0700
committerzotlabs <mike@macgirvin.com>2018-03-23 21:44:55 -0700
commita8d81a68d62e982094110a340341756fbb6df4a9 (patch)
tree51f310e1b99b5a8e87d8c349b44f73ea7c3ba6e0 /Zotlabs/Module
parentabe6ab477531916158c04e3d387cb02e839d28b6 (diff)
parent09567da292e4ff1eb89a781b685b26b2f9ba82b4 (diff)
downloadvolse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.gz
volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.bz2
volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Ochannel.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/Zotlabs/Module/Ochannel.php b/Zotlabs/Module/Ochannel.php
index 3b187d2a6..508be1408 100644
--- a/Zotlabs/Module/Ochannel.php
+++ b/Zotlabs/Module/Ochannel.php
@@ -56,6 +56,9 @@ class Ochannel extends \Zotlabs\Web\Controller {
function get($update = 0, $load = false) {
+ if(argc() < 2)
+ return;
+
if($load)
$_SESSION['loadtime'] = datetime_convert();