diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-23 14:00:24 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-23 14:00:24 -0800 |
| commit | e5141dd91bf483b0458b6f9226b994afbee23524 (patch) | |
| tree | 958afce923e2b7b13278c19d8c707daf73bf2a73 /Zotlabs/Widget | |
| parent | 9936670f44b53e391d997fd024faa329b8a0c803 (diff) | |
| parent | 14f12927436f71c753127be83f348d89b99401b6 (diff) | |
| download | volse-hubzilla-e5141dd91bf483b0458b6f9226b994afbee23524.tar.gz volse-hubzilla-e5141dd91bf483b0458b6f9226b994afbee23524.tar.bz2 volse-hubzilla-e5141dd91bf483b0458b6f9226b994afbee23524.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Widget')
| -rw-r--r-- | Zotlabs/Widget/Categories.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Zotlabs/Widget/Categories.php b/Zotlabs/Widget/Categories.php index 305869706..9bfa9742a 100644 --- a/Zotlabs/Widget/Categories.php +++ b/Zotlabs/Widget/Categories.php @@ -13,8 +13,14 @@ class Categories { if(($cards) && (! feature_enabled(\App::$profile['profile_uid'],'cards'))) return ''; + $articles = ((array_key_exists('articles',$arr) && $arr['articles']) ? true : false); + + if(($articles) && (! feature_enabled(\App::$profile['profile_uid'],'articles'))) + return ''; + + if((! \App::$profile['profile_uid']) - || (! perm_is_allowed(\App::$profile['profile_uid'],get_observer_hash(),(($cards) ? 'view_pages' : 'view_stream')))) { + || (! perm_is_allowed(\App::$profile['profile_uid'],get_observer_hash(),(($cards || $articles) ? 'view_pages' : 'view_stream')))) { return ''; } @@ -25,6 +31,8 @@ class Categories { if($cards) return cardcategories_widget($srchurl, $cat); + elseif($articles) + return articlecategories_widget($srchurl, $cat); else return categories_widget($srchurl, $cat); |