diff options
author | Max Kostikov <max@kostikov.co> | 2019-05-11 15:46:16 +0200 |
---|---|---|
committer | Max Kostikov <max@kostikov.co> | 2019-05-11 15:46:16 +0200 |
commit | bf5deace8e317a91ec8c8a85a661251b75dfe6fd (patch) | |
tree | c8caa0221fcf562b8f150ae63abdeeda069ab397 /include | |
parent | a5cd0061c53737992bdd1938b57b0363418bd7ef (diff) | |
parent | 0e4acf6299e8984bb8d66c315917078e437a950b (diff) | |
download | volse-hubzilla-bf5deace8e317a91ec8c8a85a661251b75dfe6fd.tar.gz volse-hubzilla-bf5deace8e317a91ec8c8a85a661251b75dfe6fd.tar.bz2 volse-hubzilla-bf5deace8e317a91ec8c8a85a661251b75dfe6fd.zip |
Merge branch 'dev' into 'dev'
Replace photo URL for gallery on clonned channel post sync
See merge request hubzilla/core!1645
Diffstat (limited to 'include')
-rw-r--r-- | include/text.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php index 3e2b72087..a5663fc56 100644 --- a/include/text.php +++ b/include/text.php @@ -3082,7 +3082,7 @@ function item_url_replace($channel,&$item,$old,$new,$oldnick = '') { json_url_replace('/' . $oldnick . '/' ,'/' . $channel['channel_address'] . '/' ,$item['target']); } - $item['body'] = preg_replace("/(\[zrl=".preg_quote($old,'/')."\/photos\/".$channel['channel_address'].".+\]\[zmg=\d+x\d+\])".preg_quote($old,'/')."\/(.+\[\/zmg\])/", '${1}'.$new.'/${2}', $item['body']); + $item['body'] = preg_replace("/(\[zrl=".preg_quote($old,'/')."\/(photos|gallery)\/".$channel['channel_address'].".+\]\[zmg=\d+x\d+\])".preg_quote($old,'/')."\/(.+\[\/zmg\])/", '${1}'.$new.'/${3}', $item['body']); $item['body'] = preg_replace("/".preg_quote($old,'/')."\/(search|\w+\/".$channel['channel_address'].")/", $new.'/${1}', $item['body']); $item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey'])); |