diff options
| author | zottel <github@zottel.net> | 2012-04-24 10:38:23 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-24 10:38:23 +0200 |
| commit | 912e008ded3d439f7779310eb422e4b871a9b63d (patch) | |
| tree | 61f1960c1ff17e27d0755e40ea7ccb90d0c0d4b1 /include/diaspora.php | |
| parent | e6847cdd3f6faf087dc7e738e1dbae7d70113451 (diff) | |
| parent | fbdb8fc43a3cb03f25102f15a1deaf8408e9122a (diff) | |
| download | volse-hubzilla-912e008ded3d439f7779310eb422e4b871a9b63d.tar.gz volse-hubzilla-912e008ded3d439f7779310eb422e4b871a9b63d.tar.bz2 volse-hubzilla-912e008ded3d439f7779310eb422e4b871a9b63d.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/diaspora.php')
| -rw-r--r-- | include/diaspora.php | 12 |
1 files changed, 6 insertions, 6 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; } } |