Merge branch 'dev' into 'dev'

fix category widget when using articles

See merge request hubzilla/core!1664
This commit is contained in:
Max Kostikov 2019-05-31 23:28:09 +02:00
commit 2100ac3cfc

View File

@ -18,10 +18,9 @@ class Categories {
$articles = ((array_key_exists('articles',$arr) && $arr['articles']) ? true : false); $articles = ((array_key_exists('articles',$arr) && $arr['articles']) ? true : false);
if(($articles) && (! feature_enabled(App::$profile['profile_uid'],'articles'))) if(($articles) && (! Apps::system_app_installed(App::$profile['profile_uid'],'Articles')))
return ''; return '';
if((! App::$profile['profile_uid']) if((! App::$profile['profile_uid'])
|| (! perm_is_allowed(App::$profile['profile_uid'],get_observer_hash(),(($cards || $articles) ? 'view_pages' : 'view_stream')))) { || (! perm_is_allowed(App::$profile['profile_uid'],get_observer_hash(),(($cards || $articles) ? 'view_pages' : 'view_stream')))) {
return ''; return '';