diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-04-26 20:25:14 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-04-26 20:25:14 +0200 |
| commit | e7d297740117e644be18e2b9793471da5697c879 (patch) | |
| tree | 9c686af8e803b5b8cb1fa49df8aa3a5dd24b7ad2 /phpBB | |
| parent | 03eae6fddd5bb96dd140e00ad8aaef4a8f562c08 (diff) | |
| parent | 98bdcd0cde8155cdcf3161b5794951d1860071ba (diff) | |
| download | forums-e7d297740117e644be18e2b9793471da5697c879.tar forums-e7d297740117e644be18e2b9793471da5697c879.tar.gz forums-e7d297740117e644be18e2b9793471da5697c879.tar.bz2 forums-e7d297740117e644be18e2b9793471da5697c879.tar.xz forums-e7d297740117e644be18e2b9793471da5697c879.zip | |
Merge pull request #3548 from s9e/ticket/12745
[ticket/12745] Allow Unicode characters from the SMP to be used in text
* s9e/ticket/12745:
[ticket/12745] Added HTML entity test
[ticket/12745] Added support for Unicode characters outside BMP
[ticket/12745] Updated s9e\TextFormatter
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/composer.lock | 8 | ||||
| -rw-r--r-- | phpBB/includes/message_parser.php | 9 |
2 files changed, 4 insertions, 13 deletions
diff --git a/phpBB/composer.lock b/phpBB/composer.lock index adc109b0ee..ce7e0072d7 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -169,12 +169,12 @@ "source": { "type": "git", "url": "https://github.com/s9e/TextFormatter.git", - "reference": "5b7d4c40bdef53f26ca6b09e85163f28e852f16b" + "reference": "31fe627a4a82d41098a2db8036287c0693c79f13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/5b7d4c40bdef53f26ca6b09e85163f28e852f16b", - "reference": "5b7d4c40bdef53f26ca6b09e85163f28e852f16b", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/31fe627a4a82d41098a2db8036287c0693c79f13", + "reference": "31fe627a4a82d41098a2db8036287c0693c79f13", "shasum": "" }, "require": { @@ -219,7 +219,7 @@ "parser", "shortcodes" ], - "time": "2015-04-22 15:15:46" + "time": "2015-04-25 20:58:33" }, { "name": "symfony/config", diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 8353ae6843..3027566f43 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1241,15 +1241,6 @@ class parse_message extends bbcode_firstpass // Parse this message $this->message = $parser->parse(htmlspecialchars_decode($this->message, ENT_QUOTES)); - // Check for out-of-bounds characters that are currently - // not supported by utf8_bin in MySQL - if (preg_match_all('/[\x{10000}-\x{10FFFF}]/u', $this->message, $matches)) - { - $character_list = implode('<br />', $matches[0]); - $this->warn_msg[] = $user->lang('UNSUPPORTED_CHARACTERS_MESSAGE', $character_list); - return $update_this_message ? $this->warn_msg : $return_message; - } - // Check for "empty" message. We do not check here for maximum length, because bbcode, smilies, etc. can add to the length. // The maximum length check happened before any parsings. if ($mode === 'post' && utf8_clean_string($this->message) === '') |