Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

7 files changed, 24 insertions, 9 deletions

diff --git a/Zotlabs/Daemon/Cache_query.php b/Zotlabs/Daemon/Cache_query.php
index 8e5c6b2ea..d5788795f 100644
--- a/Zotlabs/Daemon/Cache_query.php
+++ b/Zotlabs/Daemon/Cache_query.php
@@ -12,6 +12,7 @@ class Cache_query {
 		if(! $argc == 3)
 			return;
 
+		$r = null;
 		$key = $argv[1];
 
 		$pid = Config::Get('procid', $key, false);
@@ -29,8 +30,10 @@ class Cache_query {
 		$arr = json_decode(base64_decode($argv[0]), true);
 
 		$r = call_user_func_array('q', $arr);
-		if($r)
+
+		if(is_array($r)) {
 			Cache::set($key, serialize($r));
+		}
 
 		Config::Delete('procid', $key);
 
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index b62f268d3..a68fdcf26 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -3,7 +3,7 @@
 namespace Zotlabs\Storage;
 
 use Sabre\DAV;
-use Zotlabz\Lib\Config;
+use Zotlabs\Lib\Config;
 use Zotlabs\Lib\Libsync;
 
 /**
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 43aae4b25..84f688d36 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -2,6 +2,7 @@
 
 use Zotlabs\Lib\Cache;
 use Zotlabs\Lib\Config;
+use Zotlabs\Daemon\Master;
 
 function findpeople_widget() {
 
@@ -67,11 +68,12 @@ function categories_widget($baseurl,$selected = '') {
 
 	require_once('include/security.php');
 
-	$sql_extra = item_permissions_sql(App::$profile['profile_uid']);
+	$observer = get_observer_hash();
+	$sql_extra = item_permissions_sql(App::$profile['profile_uid'], $observer);
 
 	$item_normal = item_normal();
 
-	$key = __FUNCTION__ . "-" . App::$profile['profile_uid'];
+	$key = __FUNCTION__ . '_' . md5(App::$profile['profile_uid'] . $observer);
 
 	$content = Cache::get($key, '5 MINUTE');
 	if (! $content) {
@@ -97,7 +99,7 @@ function categories_widget($baseurl,$selected = '') {
 			dbesc(ACTIVITY_UPDATE)
 		];
 
-		\Zotlabs\Daemon\Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]);
+		Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]);
 	}
 
 	if (!$content) {
diff --git a/include/taxonomy.php b/include/taxonomy.php
index 49b364154..45287fa63 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -7,6 +7,7 @@
 
 use Zotlabs\Lib\Cache;
 use Zotlabs\Lib\Config;
+use Zotlabs\Daemon\Master;
 
 
 function file_tag_encode($s) {
@@ -358,7 +359,7 @@ function pub_tagadelic($net, $site, $limit, $recent, $safemode, $type) {
 		}
 	}
 
-	$key = __FUNCTION__ . "-" . md5($site . $recent . $safemode . $limit . $type);
+	$key = __FUNCTION__ . '_' . md5($site . $recent . $safemode . $limit . $type);
 
 	$content = Cache::get($key, '5 MINUTE');
 	if(! $content) {
@@ -378,7 +379,7 @@ function pub_tagadelic($net, $site, $limit, $recent, $safemode, $type) {
 			(intval($count) ? "LIMIT $count" : '')
 		];
 
-		\Zotlabs\Daemon\Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]);
+		Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]);
 	}
 
 	$r = unserialize($content);
diff --git a/util/udall b/util/udall
index 44f37e86e..50ef56bfe 100755
--- a/util/udall
+++ b/util/udall
@@ -5,7 +5,7 @@ if [ ! -d .git ]; then
 fi
 git pull
 
-if [ -d extend ] ; then
+if [ -d extend ]; then
 	for a in  theme addon widget ; do
 		if [ -d extend/$a ]; then
 			for b in  `ls extend/$a` ; do
@@ -15,3 +15,8 @@ if [ -d extend ] ; then
 		fi
 	done
 fi
+
+# Allow to run additional site specific commands
+if [ -f util/udall_extra ]; then
+	source util/udall_extra
+fi
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 30b9ba64c..56194c735 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -996,6 +996,10 @@ img.mail-conv-sender-photo {
 	margin-top: 2em;
 }
 
+.wall-item-pinned i {
+	transform: rotate(45deg);
+}
+
 .wall-item-content-wrapper {
 	background-color: var(--bs-tertiary-bg);
 }
diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl
index fd27dca44..a7be796d6 100644
--- a/view/tpl/categories_widget.tpl
+++ b/view/tpl/categories_widget.tpl
@@ -5,7 +5,7 @@
 	<ul class="nav nav-pills flex-column">
 		<li class="nav-item"><a href="{{$base}}" class="nav-link{{if $sel_all}} active{{/if}}">{{$all}}</a></li>
 		{{foreach $terms as $term}}
-		<li class="nav-item"><a  href="{{$base}}/?cat={{$term.name|urlencode}}" class="nav-link{{if $term.selected}} active{{/if}}">{{$term.name}}</a></li>
+		<li class="nav-item"><a  href="{{$base}}/?cat={{$term.name|escape:'url'}}" class="nav-link{{if $term.selected}} active{{/if}}">{{$term.name}}</a></li>
 		{{/foreach}}
 	</ul>