diff options
author | marijus <mario@localhost.localdomain> | 2014-02-07 13:50:18 +0100 |
---|---|---|
committer | marijus <mario@localhost.localdomain> | 2014-02-07 13:50:18 +0100 |
commit | 6dd05bb53fb7892a386740f6ee246649f6f70e1e (patch) | |
tree | cb959c7969402bcc3a70acfb5088ec34f43402f5 /mod/item.php | |
parent | 6f2c168d1a434b2223f09a922780617fdc07b278 (diff) | |
parent | c80325b4279b6f19540416064382755ca5e6eccd (diff) | |
download | volse-hubzilla-6dd05bb53fb7892a386740f6ee246649f6f70e1e.tar.gz volse-hubzilla-6dd05bb53fb7892a386740f6ee246649f6f70e1e.tar.bz2 volse-hubzilla-6dd05bb53fb7892a386740f6ee246649f6f70e1e.zip |
Merge branch 'master' of https://github.com/friendica/red into upstream
Diffstat (limited to 'mod/item.php')
-rw-r--r-- | mod/item.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/item.php b/mod/item.php index c8c0e3762..47a3f1961 100644 --- a/mod/item.php +++ b/mod/item.php @@ -425,7 +425,7 @@ function item_post(&$a) { * (already known to us) which will get a zrl, otherwise link with url */ - $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); /** * |