From 91ebfbc2153a89ba0bc7023b64a58d99d957f68f Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Tue, 9 Mar 2021 15:58:26 +0000 Subject: Check if we have an observer xchan --- Zotlabs/Widget/Pinned.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Widget/Pinned.php b/Zotlabs/Widget/Pinned.php index 0a7806908..1cd4dbc15 100644 --- a/Zotlabs/Widget/Pinned.php +++ b/Zotlabs/Widget/Pinned.php @@ -43,7 +43,7 @@ class Pinned { $midb64 = 'b64.' . base64url_encode($item['mid']); - if(in_array($observer['xchan_hash'], get_pconfig($item['uid'], 'pinned_hide', $midb64, []))) + if(isset($observer['xchan_hash']) && in_array($observer['xchan_hash'], get_pconfig($item['uid'], 'pinned_hide', $midb64, []))) continue; $author = channelx_by_hash($item['author_xchan']); -- cgit v1.2.3 From 15b45af550cb59013cbf915c63635fdf03cdd73e Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Tue, 9 Mar 2021 16:59:44 +0100 Subject: Revert "Check if we have an observer xchan" This reverts commit 91ebfbc2153a89ba0bc7023b64a58d99d957f68f --- Zotlabs/Widget/Pinned.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Widget/Pinned.php b/Zotlabs/Widget/Pinned.php index 1cd4dbc15..0a7806908 100644 --- a/Zotlabs/Widget/Pinned.php +++ b/Zotlabs/Widget/Pinned.php @@ -43,7 +43,7 @@ class Pinned { $midb64 = 'b64.' . base64url_encode($item['mid']); - if(isset($observer['xchan_hash']) && in_array($observer['xchan_hash'], get_pconfig($item['uid'], 'pinned_hide', $midb64, []))) + if(in_array($observer['xchan_hash'], get_pconfig($item['uid'], 'pinned_hide', $midb64, []))) continue; $author = channelx_by_hash($item['author_xchan']); -- cgit v1.2.3 From 7795224e70711be2fd08d59c17c0b0bbf3b822fa Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Wed, 10 Mar 2021 19:43:42 +0000 Subject: Check for HTTP port use --- Zotlabs/Daemon/Queue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Daemon/Queue.php b/Zotlabs/Daemon/Queue.php index 36bdcfe81..e1f4b73de 100644 --- a/Zotlabs/Daemon/Queue.php +++ b/Zotlabs/Daemon/Queue.php @@ -28,7 +28,7 @@ class Queue { if ($r) { foreach ($r as $rr) { $h = parse_url($rr['outq_posturl']); - $desturl = $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : ''); + $desturl = $h['scheme'] . '://' . $h['host'] . (isset($h['port']) ? ':' . $h['port'] : ''); q("update site set site_dead = 1 where site_dead = 0 and site_url = '%s' and site_update < %s - INTERVAL %s", dbesc($desturl), db_utcnow(), db_quoteinterval('1 MONTH') -- cgit v1.2.3 From 86ed4f4f9906663f96876a4ea8fde126c55b671c Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Wed, 10 Mar 2021 19:44:02 +0000 Subject: Check for HTTP port use --- Zotlabs/Lib/Queue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Lib/Queue.php b/Zotlabs/Lib/Queue.php index ba314ded3..373a7d304 100644 --- a/Zotlabs/Lib/Queue.php +++ b/Zotlabs/Lib/Queue.php @@ -134,7 +134,7 @@ class Queue { $base = null; $h = parse_url($outq['outq_posturl']); if($h !== false) - $base = $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : ''); + $base = $h['scheme'] . '://' . $h['host'] . (isset($h['port']) ? ':' . $h['port'] : ''); if(($base) && ($base !== z_root()) && ($immediate)) { $y = q("select site_update, site_dead from site where site_url = '%s' ", -- cgit v1.2.3 From 9098bb431cefa0a865938d866a7f34396e21a154 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Wed, 10 Mar 2021 19:44:17 +0000 Subject: Check for HTTP port use --- include/bookmarks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bookmarks.php b/include/bookmarks.php index 145119347..207cf5a33 100644 --- a/include/bookmarks.php +++ b/include/bookmarks.php @@ -73,6 +73,6 @@ function get_bookmark_link($observer) { $h = @parse_url($observer['xchan_url']); if($h) - return $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : '') . '/rbmark?f='; + return $h['scheme'] . '://' . $h['host'] . (isset($h['port']) ? ':' . $h['port'] : '') . '/rbmark?f='; return ''; } -- cgit v1.2.3 From f8467845d208c0efde81d00d51cd0eb10637f6d5 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Wed, 10 Mar 2021 19:44:54 +0000 Subject: Check for HTTP port use --- include/queue_fn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/queue_fn.php b/include/queue_fn.php index b505a5b22..1e8171b1d 100644 --- a/include/queue_fn.php +++ b/include/queue_fn.php @@ -132,7 +132,7 @@ function queue_deliver($outq, $immediate = false) { $base = null; $h = parse_url($outq['outq_posturl']); if($h !== false) - $base = $h['scheme'] . '://' . $h['host'] . (array_key_exists('port', $h) ? ':' . $h['port'] : ''); + $base = $h['scheme'] . '://' . $h['host'] . (isset($h['port']) ? ':' . $h['port'] : ''); if(($base) && ($base !== z_root()) && ($immediate)) { $y = q("select site_update, site_dead from site where site_url = '%s' ", -- cgit v1.2.3