aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-04-25 02:26:37 -0700
committerzotlabs <mike@macgirvin.com>2018-04-25 02:26:37 -0700
commit63e8f1f36b1b33f825b2c544b610e140291d0048 (patch)
treeba60aaa95da2363453a815c09e39e95ffdf86ef8
parent8face5a66c82e7086c379ca4b07f178a85a781b3 (diff)
downloadvolse-hubzilla-63e8f1f36b1b33f825b2c544b610e140291d0048.tar.gz
volse-hubzilla-63e8f1f36b1b33f825b2c544b610e140291d0048.tar.bz2
volse-hubzilla-63e8f1f36b1b33f825b2c544b610e140291d0048.zip
undo_post_tagging - don't waste a connection query if we're undoing a hashtag and not a mention.
-rw-r--r--include/text.php9
1 files 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);
}