diff options
| author | friendica <info@friendica.com> | 2012-04-23 22:41:32 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-04-23 22:41:32 -0700 |
| commit | 2064d86cb39c20b738ba5f8ca35d4102216a5c30 (patch) | |
| tree | 20001bd549f007e7cf708fd3e8c1903da2bb91a5 /include | |
| parent | 363753411914ab9d2678c5b47f432e5357ad7a04 (diff) | |
| download | volse-hubzilla-2064d86cb39c20b738ba5f8ca35d4102216a5c30.tar.gz volse-hubzilla-2064d86cb39c20b738ba5f8ca35d4102216a5c30.tar.bz2 volse-hubzilla-2064d86cb39c20b738ba5f8ca35d4102216a5c30.zip | |
separate tag search from body search
Diffstat (limited to 'include')
| -rw-r--r-- | include/diaspora.php | 12 | ||||
| -rw-r--r-- | include/html2plain.php | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index afd86957b..5069c1127 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -706,10 +706,10 @@ function diaspora_post($importer,$xml) { continue; $basetag = str_replace('_',' ',substr($tag,1)); - $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); + $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); if(strlen($str_tags)) $str_tags .= ','; - $str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; + $str_tags .= '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; continue; } } @@ -872,10 +872,10 @@ function diaspora_reshare($importer,$xml) { $basetag = str_replace('_',' ',substr($tag,1)); - $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); + $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); if(strlen($str_tags)) $str_tags .= ','; - $str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; + $str_tags .= '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; continue; } } @@ -1113,10 +1113,10 @@ function diaspora_comment($importer,$xml,$msg) { $basetag = str_replace('_',' ',substr($tag,1)); - $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); + $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); if(strlen($str_tags)) $str_tags .= ','; - $str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; + $str_tags .= '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; continue; } } 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) |