diff options
| author | Mario <mario@mariovavti.com> | 2018-12-16 20:08:52 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-12-16 20:08:52 +0100 |
| commit | 6c72c3d4a5af91453e3f1d558921e501112fddf1 (patch) | |
| tree | 1fb6a0f100b3cbfd4dab1f9e872e8b2f8e7d868e /Zotlabs | |
| parent | c854ec068641db3b9fce3e5b9e3ffdc59d8d621e (diff) | |
| parent | 5bcc379530e6789f59397dc39f4da66cc8c5b2ae (diff) | |
| download | volse-hubzilla-6c72c3d4a5af91453e3f1d558921e501112fddf1.tar.gz volse-hubzilla-6c72c3d4a5af91453e3f1d558921e501112fddf1.tar.bz2 volse-hubzilla-6c72c3d4a5af91453e3f1d558921e501112fddf1.zip | |
Merge branch 'patch-20181214a' into 'dev'
ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed.
See merge request hubzilla/core!1427
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Articles.php | 12 |
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); |