harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mario Vavti 2018-10-08 11:26:14 +02:00
commit 737f660011
3 changed files with 15099 additions and 14951 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/text.php
View File

@ -2965,7 +2965,9 @@ 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']);
} }
if(string_replace($old,$new,$item['body'])) { $x = preg_replace("/".preg_quote($old,'/')."\/(search|\w+\/".$channel['channel_address'].")/", $new.'/${1}', $item['body']);
if($x) {
$item['body'] = $x;
$item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey'])); $item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey']));
$item['item_verified'] = 1; $item['item_verified'] = 1;
} }

24636
view/ru/hmessages.po
View File

File diff suppressed because it is too large Load Diff

5410
view/ru/hstrings.php
View File

File diff suppressed because it is too large Load Diff