diff options
| author | Andrew Manning <andrewmanning@grid.reticu.li> | 2017-08-24 18:57:52 +0000 |
|---|---|---|
| committer | Andrew Manning <andrewmanning@grid.reticu.li> | 2017-08-24 18:57:52 +0000 |
| commit | 90ec3340e44a3d3c69779f0db33ee49e864f326d (patch) | |
| tree | 2b0bc859c3a7d31adcd1c9777d9868b9dbecdeda /Zotlabs/Widget | |
| parent | cf2609530fcffdc7f5477336232b7cfde8b6403f (diff) | |
| parent | cdccf601320ec7e59f5d96438edac34d5ea30085 (diff) | |
| download | volse-hubzilla-90ec3340e44a3d3c69779f0db33ee49e864f326d.tar.gz volse-hubzilla-90ec3340e44a3d3c69779f0db33ee49e864f326d.tar.bz2 volse-hubzilla-90ec3340e44a3d3c69779f0db33ee49e864f326d.zip | |
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'Zotlabs/Widget')
| -rw-r--r-- | Zotlabs/Widget/Categories.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Zotlabs/Widget/Categories.php b/Zotlabs/Widget/Categories.php index d1dcfda93..84deb03d6 100644 --- a/Zotlabs/Widget/Categories.php +++ b/Zotlabs/Widget/Categories.php @@ -8,8 +8,13 @@ class Categories { function widget($arr) { + $cards = ((array_key_exists('cards',$arr) && $arr['cards']) ? true : false); + + if(($cards) && (! feature_enabled(\App::$profile['profile_uid'],'cards'))) + return ''; + if((! \App::$profile['profile_uid']) - || (! perm_is_allowed(\App::$profile['profile_uid'],get_observer_hash(),'view_stream'))) { + || (! perm_is_allowed(\App::$profile['profile_uid'],get_observer_hash(),(($cards) ? 'view_pages' : 'view_stream')))) { return ''; } @@ -18,6 +23,10 @@ class Categories { $srchurl = rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&'); $srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl); - return categories_widget($srchurl, $cat); + if($cards) + return cardcategories_widget($srchurl, $cat); + else + return categories_widget($srchurl, $cat); + } } |