diff options
| author | friendica <info@friendica.com> | 2013-08-26 03:54:27 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-08-26 03:54:27 -0700 |
| commit | 2f2a316b27221759d433a786fb3485238f032a37 (patch) | |
| tree | c9fa81d5aada7e235d885c973695c4fb7b07064d | |
| parent | e9125ce06534736290e461508b5f5092ca73b02d (diff) | |
| download | volse-hubzilla-2f2a316b27221759d433a786fb3485238f032a37.tar.gz volse-hubzilla-2f2a316b27221759d433a786fb3485238f032a37.tar.bz2 volse-hubzilla-2f2a316b27221759d433a786fb3485238f032a37.zip | |
regex patch
| -rwxr-xr-x | boot.php | 1 | ||||
| -rw-r--r-- | include/bbcode.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -295,6 +295,7 @@ define ( 'MENU_ITEM_NEWWIN', 0x0002); define ( 'POLL_SIMPLE_RATING', 0x0001); define ( 'POLL_MULTIPLE_CHOICE', 0x0002); +define ( 'POLL_OVERWRITE', 0x8000); // If you vote twice remove the prior entry /** diff --git a/include/bbcode.php b/include/bbcode.php index a0a53a310..9f9489893 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -271,7 +271,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $urlchars = '[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]'; if (strpos($Text,'http') !== false) { - $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/$urlchars+)/ism", '$1<a href="$2" >$2</a>', $Text); + $Text = preg_replace("/([^\"\]\='".'"'."]|^)(https?\:\/\/$urlchars+)/ism", '$1<a href="$2" >$2</a>', $Text); } if (strpos($Text,'[/share]') !== false) { $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributes",$Text); diff --git a/version.inc b/version.inc index e6cafa871..009ce6d57 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-08-25.416 +2013-08-26.417 |