diff options
| author | zotlabs <mike@macgirvin.com> | 2018-09-10 22:11:26 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-09-10 22:11:26 -0700 |
| commit | adc164b825c3b9e322921f2da9d1baf178b04cd3 (patch) | |
| tree | fa5e805e53e7661ad936873e1a66017ad9dcd6a9 /Zotlabs/Widget | |
| parent | be3b6304742a6c39d73674b1f7422c029e7cd804 (diff) | |
| parent | c6abe87ec2e08fc38ff9c505ac2000d52d45c228 (diff) | |
| download | volse-hubzilla-adc164b825c3b9e322921f2da9d1baf178b04cd3.tar.gz volse-hubzilla-adc164b825c3b9e322921f2da9d1baf178b04cd3.tar.bz2 volse-hubzilla-adc164b825c3b9e322921f2da9d1baf178b04cd3.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'Zotlabs/Widget')
| -rw-r--r-- | Zotlabs/Widget/Categories.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Zotlabs/Widget/Categories.php b/Zotlabs/Widget/Categories.php index 9bfa9742a..27d4b5980 100644 --- a/Zotlabs/Widget/Categories.php +++ b/Zotlabs/Widget/Categories.php @@ -2,6 +2,9 @@ namespace Zotlabs\Widget; +use App; +use Zotlabs\Lib\Apps; + require_once('include/contact_widgets.php'); class Categories { @@ -10,22 +13,22 @@ class Categories { $cards = ((array_key_exists('cards',$arr) && $arr['cards']) ? true : false); - if(($cards) && (! feature_enabled(\App::$profile['profile_uid'],'cards'))) + if(($cards) && (! Apps::system_app_installed(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'))) + 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 || $articles) ? 'view_pages' : 'view_stream')))) { + if((! App::$profile['profile_uid']) + || (! perm_is_allowed(App::$profile['profile_uid'],get_observer_hash(),(($cards || $articles) ? 'view_pages' : 'view_stream')))) { return ''; } $cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : ''); - $srchurl = (($cards) ? \App::$argv[0] . '/' . \App::$argv[1] : \App::$query_string); + $srchurl = (($cards) ? App::$argv[0] . '/' . App::$argv[1] : App::$query_string); $srchurl = rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&'); $srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl); |