Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 22:15:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of /home/macgirvin/z into dev

Browse source
This commit is contained in:
nobody 2021-11-17 11:43:08 -08:00
commit 98e3880318
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/items.php
View file

@ -348,6 +348,7 @@ function can_comment_on_post($observer_xchan, $item) {
return true; return true;
break; break;
case 'any connections': case 'any connections':
case 'specific':
case 'contacts': case 'contacts':
case '': case '':
@ -1193,8 +1194,9 @@ function map_scope($scope, $strip = false) {
return 'site: ' . App::get_hostname(); return 'site: ' . App::get_hostname();
case PERMS_PENDING: case PERMS_PENDING:
return 'any connections'; return 'any connections';
case PERMS_SPECIFIC: // uncomment a few releases after the corresponding changes are made in can_comment_on_post. Here it was done on 2021-11-18
return 'specific'; // case PERMS_SPECIFIC:
// return 'specific';
case PERMS_CONTACTS: case PERMS_CONTACTS:
default: default:
return 'contacts'; return 'contacts';

3
include/text.php
View file

@ -3256,9 +3256,6 @@ function item_url_replace($channel,&$item,$old,$new,$oldnick = '') {
json_url_replace('/' . $oldnick . '/' ,'/' . $channel['channel_address'] . '/' ,$item['target']); json_url_replace('/' . $oldnick . '/' ,'/' . $channel['channel_address'] . '/' ,$item['target']);
} }
$root_replaced = null;
$nick_replaced = null;
$item['body'] = str_replace($old, $new, $item['body']); $item['body'] = str_replace($old, $new, $item['body']);
if($oldnick && ($oldnick !== $channel['channel_address'])) { if($oldnick && ($oldnick !== $channel['channel_address'])) {