diff options
| author | zottel <github@zottel.net> | 2012-04-08 21:50:41 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-08 21:50:41 +0200 |
| commit | 315d496290747aab8b3147dc24b822460071bb2d (patch) | |
| tree | 4d3cd849580d7ba3b8c30667bbb6f0901dc7d738 /include/html2plain.php | |
| parent | aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b (diff) | |
| parent | 5c0446975516f2b52b6cf51618e0b75af56de71b (diff) | |
| download | volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.tar.gz volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.tar.bz2 volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/html2plain.php')
| -rw-r--r-- | include/html2plain.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/html2plain.php b/include/html2plain.php index fe0e3326e..7aa20500a 100644 --- a/include/html2plain.php +++ b/include/html2plain.php @@ -83,12 +83,15 @@ function collecturls($message) { $urls = array(); foreach ($result as $treffer) { // A list of some links that should be ignored - $list = array("/user/", "/tag/", "/profile/", "/search?search=", "mailto:", "/u/", "/node/", + $list = array("/user/", "/tag/", "/group/", "/profile/", "/search?search=", "mailto:", "/u/", "/node/", "//facebook.com/profile.php?id=", "//plus.google.com/"); foreach ($list as $listitem) if (strpos($treffer[1], $listitem) !== false) $ignore = true; + if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/posts") !== false)) + $ignore = false; + if (!$ignore) $urls[$treffer[1]] = $treffer[1]; } |