harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't double-encode hashtags

Browse Source
This commit is contained in:
friendica 2014-10-08 14:47:24 -07:00
parent 1fc3138c37
commit 202039d389
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/diaspora.php
View File

@ -821,7 +821,7 @@ function diaspora_post($importer,$xml,$msg) {
foreach($tags as $tag) { foreach($tags as $tag) {
if(strpos($tag,'#') === 0) { if(strpos($tag,'#') === 0) {
if(strpos($tag,'[url=')) if((strpos($tag,'[url=')) || (strpos($tag,'[zrl')))
continue; continue;
// don't link tags that are already embedded in links // don't link tags that are already embedded in links
@ -1050,7 +1050,7 @@ function diaspora_reshare($importer,$xml,$msg) {
foreach($tags as $tag) { foreach($tags as $tag) {
if(strpos($tag,'#') === 0) { if(strpos($tag,'#') === 0) {
if(strpos($tag,'[url=')) if((strpos($tag,'[url=')) || (strpos($tag,'[zrl')))
continue; continue;
// don't link tags that are already embedded in links // 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; $plink = 'https://'.substr($diaspora_handle,strpos($diaspora_handle,'@')+1).'/posts/'.$guid;
$datarray['uid'] = $importer['channel_id']; $datarray['uid'] = $importer['channel_id'];
@ -1337,7 +1337,7 @@ function diaspora_comment($importer,$xml,$msg) {
foreach($tags as $tag) { foreach($tags as $tag) {
if(strpos($tag,'#') === 0) { if(strpos($tag,'#') === 0) {
if(strpos($tag,'[url=')) if((strpos($tag,'[url=')) || (strpos($tag,'[zrl')))
continue; continue;
// don't link tags that are already embedded in links // don't link tags that are already embedded in links