aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Widget/Categories.php
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2020-12-19 22:02:51 +0100
committerMax Kostikov <max@kostikov.co>2020-12-19 22:02:51 +0100
commit116fc4e00df8f0a232289bc3fce37f8fc16f1c9d (patch)
tree0d1cc173d40f620626dff401333d7756975e8fc2 /Zotlabs/Widget/Categories.php
parent600dcdfc583ab671fc61ff957ad7fd1a3a0c547d (diff)
parent57f6f54f29623972abc980b5e87c7933e32d1d3a (diff)
downloadvolse-hubzilla-116fc4e00df8f0a232289bc3fce37f8fc16f1c9d.tar.gz
volse-hubzilla-116fc4e00df8f0a232289bc3fce37f8fc16f1c9d.tar.bz2
volse-hubzilla-116fc4e00df8f0a232289bc3fce37f8fc16f1c9d.zip
Merge branch 'dev' into 'dev'
Dev sync See merge request kostikov/core!4
Diffstat (limited to 'Zotlabs/Widget/Categories.php')
-rw-r--r--Zotlabs/Widget/Categories.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/Zotlabs/Widget/Categories.php b/Zotlabs/Widget/Categories.php
index 82c37cd0c..94ad469da 100644
--- a/Zotlabs/Widget/Categories.php
+++ b/Zotlabs/Widget/Categories.php
@@ -21,7 +21,9 @@ class Categories {
if(($articles) && (! Apps::system_app_installed(App::$profile['profile_uid'],'Articles')))
return '';
- if((! App::$profile['profile_uid'])
+ $files = ((array_key_exists('files',$arr) && $arr['files']) ? true : false);
+
+ if((! App::$profile['profile_uid'])
|| (! perm_is_allowed(App::$profile['profile_uid'],get_observer_hash(),(($cards || $articles) ? 'view_pages' : 'view_stream')))) {
return '';
}
@@ -29,12 +31,14 @@ class Categories {
$cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : '');
$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);
+ $srchurl = str_replace(array('?f=','&f=', '/?'),array('', '', ''),$srchurl);
if($cards)
return cardcategories_widget($srchurl, $cat);
elseif($articles)
return articlecategories_widget($srchurl, $cat);
+ elseif($files)
+ return filecategories_widget($srchurl, $cat);
else
return categories_widget($srchurl, $cat);