diff options
| author | friendica <info@friendica.com> | 2014-10-08 14:47:24 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-10-08 14:47:24 -0700 |
| commit | 202039d3895462b6dced82024c4d351a84c15ecd (patch) | |
| tree | 1eb777c074f5e1313a2603135bb101aee56bc093 | |
| parent | 1fc3138c37564f44ea028c5fa8e69c718d08f363 (diff) | |
| download | volse-hubzilla-202039d3895462b6dced82024c4d351a84c15ecd.tar.gz volse-hubzilla-202039d3895462b6dced82024c4d351a84c15ecd.tar.bz2 volse-hubzilla-202039d3895462b6dced82024c4d351a84c15ecd.zip | |
don't double-encode hashtags
| -rwxr-xr-x | include/diaspora.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index f0687e51e..d288e1435 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -821,7 +821,7 @@ function diaspora_post($importer,$xml,$msg) { foreach($tags as $tag) { if(strpos($tag,'#') === 0) { - if(strpos($tag,'[url=')) + if((strpos($tag,'[url=')) || (strpos($tag,'[zrl'))) continue; // don't link tags that are already embedded in links @@ -1050,7 +1050,7 @@ function diaspora_reshare($importer,$xml,$msg) { foreach($tags as $tag) { if(strpos($tag,'#') === 0) { - if(strpos($tag,'[url=')) + if((strpos($tag,'[url=')) || (strpos($tag,'[zrl'))) continue; // don't link tags that are already embedded in links @@ -1087,7 +1087,7 @@ function diaspora_reshare($importer,$xml,$msg) { } } - // This won't work + // This won't work on redmatrix $plink = 'https://'.substr($diaspora_handle,strpos($diaspora_handle,'@')+1).'/posts/'.$guid; $datarray['uid'] = $importer['channel_id']; @@ -1337,7 +1337,7 @@ function diaspora_comment($importer,$xml,$msg) { foreach($tags as $tag) { if(strpos($tag,'#') === 0) { - if(strpos($tag,'[url=')) + if((strpos($tag,'[url=')) || (strpos($tag,'[zrl'))) continue; // don't link tags that are already embedded in links |