diff options
| author | friendica <info@friendica.com> | 2014-02-09 00:31:16 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-09 00:31:16 -0800 |
| commit | 63879210002866db884e102ed352f664f44a7baf (patch) | |
| tree | da2748499107fea5c75eb88280c5c268eebd1241 | |
| parent | c5f0b85357e04f436402d16a3b3781df47f30812 (diff) | |
| parent | 96881e833041f708174e48046555d09fc1eb67a8 (diff) | |
| download | volse-hubzilla-63879210002866db884e102ed352f664f44a7baf.tar.gz volse-hubzilla-63879210002866db884e102ed352f664f44a7baf.tar.bz2 volse-hubzilla-63879210002866db884e102ed352f664f44a7baf.zip | |
Merge https://github.com/friendica/red into zpull
| -rw-r--r-- | include/bbcode.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index bd2c7d11a..9cd5ad58c 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -443,10 +443,14 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { } } if (strpos($Text,'[/url]') !== false) { + $Text = preg_replace("/\#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '<span class="bookmark-identifier">#^</span><a class="bookmark" href="$1" >$1</a>', $Text); + $Text = preg_replace("/\#\^\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<span class="bookmark-identifier">#^</span><a class="bookmark" href="$1" >$2</a>', $Text); $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" >$1</a>', $Text); $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" >$2</a>', $Text); } if (strpos($Text,'[/zrl]') !== false) { + $Text = preg_replace("/\#\^\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '<span class="bookmark-identifier">#^</span><a class="zrl bookmark" href="$1" >$1</a>', $Text); + $Text = preg_replace("/\#\^\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<span class="bookmark-identifier">#^</span><a class="zrl bookmark" href="$1" >$2</a>', $Text); $Text = preg_replace("/\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '<a class="zrl" href="$1" >$1</a>', $Text); $Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<a class="zrl" href="$1" >$2</a>', $Text); } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 209399d0c..6164407e8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2459,3 +2459,4 @@ img.mail-list-sender-photo { color: red; cursor: pointer; } + |