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

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2018-04-25 11:54:13 +02:00
commit e9f3095f41
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/text.php
View File

@ -2033,13 +2033,16 @@ function item_post_type($item) {
function undo_post_tagging($s) { function undo_post_tagging($s) {
$matches = null; $matches = null;
$x = null;
// undo tags and mentions // undo tags and mentions
$cnt = preg_match_all('/([@#])(\!*)\[zrl=(.*?)\](.*?)\[\/zrl\]/ism',$s,$matches,PREG_SET_ORDER); $cnt = preg_match_all('/([@#])(\!*)\[zrl=(.*?)\](.*?)\[\/zrl\]/ism',$s,$matches,PREG_SET_ORDER);
if($cnt) { if($cnt) {
foreach($matches as $mtch) { foreach($matches as $mtch) {
$x = q("select xchan_addr, xchan_url from xchan where xchan_url = '%s' limit 1", if($mtch[1] === '@') {
dbesc($mtch[3]) $x = q("select xchan_addr, xchan_url from xchan where xchan_url = '%s' limit 1",
); dbesc($mtch[3])
);
}
if($x) { if($x) {
$s = str_replace($mtch[0], $mtch[1] . $mtch[2] . '{' . (($x[0]['xchan_addr']) ? $x[0]['xchan_addr'] : $x[0]['xchan_url']) . '}', $s); $s = str_replace($mtch[0], $mtch[1] . $mtch[2] . '{' . (($x[0]['xchan_addr']) ? $x[0]['xchan_addr'] : $x[0]['xchan_url']) . '}', $s);
} }