From 99d6b5799387dddfdd00b5a76bb83a15dda586e3 Mon Sep 17 00:00:00 2001 From: JoshyPHP Date: Tue, 9 Aug 2016 16:16:45 +0200 Subject: [PATCH] Synced to 66605667be735e06ccbdf2b14c344c2b8bb84100 --- composer.json | 2 +- src/Plugins/Autoimage/Configurator.php | 2 +- src/Plugins/BBCodes/Configurator/BBCodeMonkey.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index a554e9497c..c061bfeb19 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "s9e/text-formatter", - "version": "0.6.1", + "version": "0.6.2", "type": "library", "description": "Multi-purpose text formatting and markup library. Plugins offer support for BBCodes, Markdown, emoticons, HTML, embedding media (YouTube, etc...), enhanced typography and more.", "homepage": "https://github.com/s9e/TextFormatter/", diff --git a/src/Plugins/Autoimage/Configurator.php b/src/Plugins/Autoimage/Configurator.php index fac2a74020..bf9c0f1b1c 100644 --- a/src/Plugins/Autoimage/Configurator.php +++ b/src/Plugins/Autoimage/Configurator.php @@ -12,7 +12,7 @@ class Configurator extends ConfiguratorBase { protected $attrName = 'src'; protected $quickMatch = '://'; - protected $regexp = '#https?://[-.\\w]+/[-./\\w]+\\.(?:gif|jpe?g|png)(?!\\S)#'; + protected $regexp = '#\\bhttps?://[-.\\w]+/[-./\\w]+\\.(?:gif|jpe?g|png)(?!\\S)#i'; protected $tagName = 'IMG'; protected function setUp() { diff --git a/src/Plugins/BBCodes/Configurator/BBCodeMonkey.php b/src/Plugins/BBCodes/Configurator/BBCodeMonkey.php index ae374de93e..4f16bf3742 100644 --- a/src/Plugins/BBCodes/Configurator/BBCodeMonkey.php +++ b/src/Plugins/BBCodes/Configurator/BBCodeMonkey.php @@ -143,7 +143,7 @@ function ($m) { $pos = \strpos($definition, '='); $name = \substr($definition, 0, $pos); - $value = \substr($definition, 1 + $pos); + $value = \preg_replace('(^"(.*?)")s', '$1', \substr($definition, 1 + $pos)); $value = \preg_replace_callback( '#(\\{(?>HASHMAP|MAP|PARSE|REGEXP)=)([A-Za-z0-9+/]+=*)#', function ($m)