aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-11-13 08:56:27 +0100
committerMario <mario@mariovavti.com>2019-11-13 08:56:27 +0100
commitb0adb70ffc893ed77941d2e38a861f0b087b9519 (patch)
treef339fc26534a52d3bb4926ac9941dbe54c0b4282
parent6e36820b1bbc35bc3d26ff4eca2b63a386b30462 (diff)
parent2f4c619d510e64eeda05366e485d50f490cefebe (diff)
downloadvolse-hubzilla-b0adb70ffc893ed77941d2e38a861f0b087b9519.tar.gz
volse-hubzilla-b0adb70ffc893ed77941d2e38a861f0b087b9519.tar.bz2
volse-hubzilla-b0adb70ffc893ed77941d2e38a861f0b087b9519.zip
Merge branch 'dev' into 'dev'
wildcard tag issue See merge request hubzilla/core!1784
-rw-r--r--include/text.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/text.php b/include/text.php
index daa3c4c94..44af40810 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2789,6 +2789,9 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true)
// select someone by attag or nick and the name passed in
if(! $r) {
+ // strip user-supplied wildcards before running a wildcard search
+ $newname = str_replace('%','',$newname);
+
$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash
WHERE xchan_addr like ('%s') AND abook_channel = %d ",
dbesc(((strpos($newname,'@')) ? $newname : $newname . '@%')),