aboutsummaryrefslogtreecommitdiffstats
path: root/include/html2plain.php
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-24 03:33:46 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-24 03:33:46 -0400
commit0e2c6c28198b0e27087ceea6d1ba9d1891405549 (patch)
tree0d5afc1cb1934f1bedfdd8a3056133564dd8a932 /include/html2plain.php
parent6e9485605f64394f8e6d830b8a959a5afc85cf2d (diff)
parent7923404c836979f5da7bd7ab47b1d93d137af1cc (diff)
downloadvolse-hubzilla-0e2c6c28198b0e27087ceea6d1ba9d1891405549.tar.gz
volse-hubzilla-0e2c6c28198b0e27087ceea6d1ba9d1891405549.tar.bz2
volse-hubzilla-0e2c6c28198b0e27087ceea6d1ba9d1891405549.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: separate tag search from body search Esperanto at 100% again Improvements to diabook-dark move unfriend to standalone function for use in account removal more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips * master:
Diffstat (limited to 'include/html2plain.php')
-rw-r--r--include/html2plain.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/html2plain.php b/include/html2plain.php
index 21261327d..839dd70a7 100644
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -83,7 +83,7 @@ function collecturls($message) {
$urls = array();
foreach ($result as $treffer) {
// A list of some links that should be ignored
- $list = array("/user/", "/tag/", "/group/", "/profile/", "/search?search=", "mailto:", "/u/", "/node/",
+ $list = array("/user/", "/tag/", "/group/", "/profile/", "/search?search=", "/search?tag=", "mailto:", "/u/", "/node/",
"//facebook.com/profile.php?id=", "//plus.google.com/");
foreach ($list as $listitem)
if (strpos($treffer[1], $listitem) !== false)