diff options
| author | Thomas Willingham <founder@kakste.com> | 2014-02-07 00:25:51 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2014-02-07 00:25:51 +0000 |
| commit | 72218f831eb4add3a702983e613ba9ea1c4a1612 (patch) | |
| tree | 33b0144d9fdce06fa662462b0807419652842dac | |
| parent | be475bb0cc066b4dbc75118ee29e369ca658d471 (diff) | |
| parent | 9b2dc9b87c01f02463997ea4674c364151918f8b (diff) | |
| download | volse-hubzilla-72218f831eb4add3a702983e613ba9ea1c4a1612.tar.gz volse-hubzilla-72218f831eb4add3a702983e613ba9ea1c4a1612.tar.bz2 volse-hubzilla-72218f831eb4add3a702983e613ba9ea1c4a1612.zip | |
Merge branch 'master' of https://github.com/friendica/red
| -rwxr-xr-x | include/items.php | 2 | ||||
| -rw-r--r-- | mod/item.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php index 1a26198da..88b258604 100755 --- a/include/items.php +++ b/include/items.php @@ -161,7 +161,7 @@ function red_zrl_callback($matches) { } if($zrl) return $matches[1] . '#^[zrl=' . $matches[2] . ']' . $matches[2] . '[/zrl]'; - return $matches[0]; + return $matches[1] . '#^[url=' . $matches[2] . ']' . $matches[2] . '[/url]'; } 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); /** * |