diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-01 14:11:37 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-01 14:11:37 +0200 |
| commit | 7d23149a61f75923b2c71a288a722ee219f5e6ba (patch) | |
| tree | dea64e1cfc15eb6f95e7440e532258dfb909c21c /include/diaspora.php | |
| parent | 59b45f7fc12027c387f04a2121ea398c1d534626 (diff) | |
| parent | bb67ca9f1c61f96db6da15aee646a20c0b77a255 (diff) | |
| download | volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.tar.gz volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.tar.bz2 volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'include/diaspora.php')
| -rwxr-xr-x | include/diaspora.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 84d28a7ec..104ccadf2 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -688,9 +688,9 @@ function diaspora_post($importer,$xml) { // don't link tags that are already embedded in links - if(preg_match('/\[(.*?)' . preg_quote($tag) . '(.*?)\]/',$body)) + if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body)) continue; - if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag) . '(.*?)\)/',$body)) + if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body)) continue; $basetag = str_replace('_',' ',substr($tag,1)); @@ -853,9 +853,9 @@ function diaspora_reshare($importer,$xml) { // don't link tags that are already embedded in links - if(preg_match('/\[(.*?)' . preg_quote($tag) . '(.*?)\]/',$body)) + if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body)) continue; - if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag) . '(.*?)\)/',$body)) + if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body)) continue; @@ -1094,9 +1094,9 @@ function diaspora_comment($importer,$xml,$msg) { // don't link tags that are already embedded in links - if(preg_match('/\[(.*?)' . preg_quote($tag) . '(.*?)\]/',$body)) + if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body)) continue; - if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag) . '(.*?)\)/',$body)) + if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body)) continue; |