diff options
| author | friendica <info@friendica.com> | 2014-02-08 12:08:07 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-08 12:08:07 -0800 |
| commit | e346aa7560b93d1e5a331fa4ad9b16c70fe83ef7 (patch) | |
| tree | 0fe5347fc2672d0681c409b3d5bd1c8379c75232 | |
| parent | e71571f619e94ab6fbbd92dea819a0effa071484 (diff) | |
| download | volse-hubzilla-e346aa7560b93d1e5a331fa4ad9b16c70fe83ef7.tar.gz volse-hubzilla-e346aa7560b93d1e5a331fa4ad9b16c70fe83ef7.tar.bz2 volse-hubzilla-e346aa7560b93d1e5a331fa4ad9b16c70fe83ef7.zip | |
that's better
| -rwxr-xr-x | include/items.php | 2 | ||||
| -rw-r--r-- | mod/item.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php index 88b258604..efc2322d5 100755 --- a/include/items.php +++ b/include/items.php @@ -159,6 +159,8 @@ function red_zrl_callback($matches) { if($r) $zrl = true; } + if($matches[1] === '#^') + $matches[1] = ''; if($zrl) return $matches[1] . '#^[zrl=' . $matches[2] . ']' . $matches[2] . '[/zrl]'; return $matches[1] . '#^[url=' . $matches[2] . ']' . $matches[2] . '[/url]'; diff --git a/mod/item.php b/mod/item.php index e8a58fe76..19d771832 100644 --- a/mod/item.php +++ b/mod/item.php @@ -431,7 +431,7 @@ function item_post(&$a) { $body = preg_replace('/\[([uz])rl(.*?)\](.*?)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)(.*?)\[\/([uz])rl\]/ism','[$1rl$2]$3"$4"$5[/$6rl]',$body); - $body = preg_replace_callback("/([^\^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body); + $body = preg_replace_callback("/([^\]\='".'"'."]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body); /** * |