aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Articles.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-12-17 18:45:42 -0800
committerzotlabs <mike@macgirvin.com>2018-12-17 18:45:42 -0800
commit15ce8bc79b219e10f709796c09c739649a8df53b (patch)
treeedd456a39ad0daf12d6cc4409a99477f4fb38d82 /Zotlabs/Module/Articles.php
parent8d70b919551f6f6462e639f7cfffda9825344e43 (diff)
parentd190b1995b0886b430beb5dac1a1e72582b9ad2b (diff)
downloadvolse-hubzilla-15ce8bc79b219e10f709796c09c739649a8df53b.tar.gz
volse-hubzilla-15ce8bc79b219e10f709796c09c739649a8df53b.tar.bz2
volse-hubzilla-15ce8bc79b219e10f709796c09c739649a8df53b.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Articles.php')
-rw-r--r--Zotlabs/Module/Articles.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/Zotlabs/Module/Articles.php b/Zotlabs/Module/Articles.php
index 58c16be45..ca132c01e 100644
--- a/Zotlabs/Module/Articles.php
+++ b/Zotlabs/Module/Articles.php
@@ -17,8 +17,16 @@ class Articles extends Controller {
if(argc() > 1)
$which = argv(1);
- else
- return;
+
+ if(! $which) {
+ if(local_channel()) {
+ $channel = App::get_channel();
+ if($channel && $channel['channel_address'])
+ $which = $channel['channel_address'];
+ } else {
+ return;
+ }
+ }
profile_load($which);