diff --git a/Code/Lib/Activity.php b/Code/Lib/Activity.php index c8d19e6a8..0d0c42d94 100644 --- a/Code/Lib/Activity.php +++ b/Code/Lib/Activity.php @@ -984,7 +984,7 @@ class Activity } $d = q( - "select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.parent_mid = '%s' and item.uid = %d limit 1", + "select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.parent_mid = '%s' and item.uid = %d and hubloc_deleted = 0 order by hubloc_id desc limit 1", dbesc($i['parent_mid']), intval($i['uid']) ); @@ -1432,7 +1432,7 @@ class Activity $d = q( - "select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.parent_mid = '%s' and item.uid = %d limit 1", + "select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.parent_mid = '%s' and item.uid = %d and hubloc_deleted = 0 order by hubloc_id desc limit 1", dbesc($i['parent_mid']), intval($i['uid']) ); diff --git a/Code/Lib/Queue.php b/Code/Lib/Queue.php index 318fc0d5c..e13bdbba8 100644 --- a/Code/Lib/Queue.php +++ b/Code/Lib/Queue.php @@ -479,7 +479,7 @@ class Queue if ($channel && $base) { $h = q( - "select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_network in ('zot6','nomad') order by hubloc_id desc limit 1", + "select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_network in ('zot6','nomad') and hubloc_deleted = 0 order by hubloc_id desc limit 1", dbesc($base) ); if ($h) { diff --git a/README.md b/README.md index 55d892e0d..2186faea5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,3 @@ -Streams -======= - So what is this space? It is sort of a personal software repository where I explore the bounds of contemporary decentralised social communications technology. It will install as a fediverse server using the LAMP stack. It is regularly maintained and updated and you are welcome to help - if you want. The commit log chronicles a dozen years of fediverse evolution from an alternative point of view - centered around the concepts of personal privacy, permissions, relative freedom from spam and abuse, autonomy, resilience, and self-determination; which I've found are mostly lacking or completely inadequate in many of the popular/mainstream fediverse projects. This work is dedicated and released to the public domain with no strings attached. Be advised that many others have contributed code to this repository under a number of different OSI-approved software licenses during its existence. This has no effect on any of your fundamental software freedoms; although corporate legal consultants who wish to re-appropriate our work for their employer's profit will likely find this lack of license clarity "troublesome". This is intentional. diff --git a/include/text.php b/include/text.php index ff0d2c584..f1eb6d754 100644 --- a/include/text.php +++ b/include/text.php @@ -2049,7 +2049,7 @@ function format_poll($item, $s, $opts) if ($activated && $commentable) { $output .= '  ' . $text . '' . EOL; - $output .= '
'; + $output .= '
'; $output .= '
'; $output .= '
'; $output .= '
' . sprintf(tt('%d Vote', '%d Votes', $total, 'noun'), $total) . ' | ' . (($totalResponses) ? intval($total / $totalResponses * 100) . '%' : '0%') . '
'; diff --git a/version.php b/version.php index fafdf0aa2..344b56cf8 100644 --- a/version.php +++ b/version.php @@ -1,2 +1,2 @@