From 63e8f1f36b1b33f825b2c544b610e140291d0048 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 25 Apr 2018 02:26:37 -0700 Subject: undo_post_tagging - don't waste a connection query if we're undoing a hashtag and not a mention. --- include/text.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/text.php b/include/text.php index 4d6d0ffb5..60f6ff383 100644 --- a/include/text.php +++ b/include/text.php @@ -2033,13 +2033,16 @@ function item_post_type($item) { function undo_post_tagging($s) { $matches = null; + $x = null; // undo tags and mentions $cnt = preg_match_all('/([@#])(\!*)\[zrl=(.*?)\](.*?)\[\/zrl\]/ism',$s,$matches,PREG_SET_ORDER); if($cnt) { foreach($matches as $mtch) { - $x = q("select xchan_addr, xchan_url from xchan where xchan_url = '%s' limit 1", - dbesc($mtch[3]) - ); + if($mtch[1] === '@') { + $x = q("select xchan_addr, xchan_url from xchan where xchan_url = '%s' limit 1", + dbesc($mtch[3]) + ); + } if($x) { $s = str_replace($mtch[0], $mtch[1] . $mtch[2] . '{' . (($x[0]['xchan_addr']) ? $x[0]['xchan_addr'] : $x[0]['xchan_url']) . '}', $s); } -- cgit v1.2.3