Changeset 6418

Timestamp:

05/19/2017 09:40:51 AM (8 years ago)

Author:

netweb

Message:

Parser: PHP 7.1 compatibility fixes to parser.php

Props xknown.
See #2973, #2987.

Merges [6212] to the 2.5 branch.

File:

• branches/2.5/includes/admin/parser.php (modified) (4 diffs)

branches/2.5/includes/admin/parser.php

@@ -81 +81 @@
 var $pat_comment2;
 var $pat_wiki;
-function BBCodeLexer($string, $tagmarker = '[') {
+function __construct($string, $tagmarker = '[') {
 $regex_beginmarkers = Array( '[' => '\[', '<' => '<', '{' => '\{', '(' => '\(' );
 $regex_endmarkers = Array( '[' => '\]', '<' => '>', '{' => '\}', '(' => '\)' );
@@ -114 +114 @@
 $this->tag = false;
 $this->text = "";
+}
+function BBCodeLexer($string, $tagmarker = '[') {
+$this->__construct($string, $tagmarker);
 }
 function GuessTextLength() {
@@ -1147 +1150 @@
 if (function_exists("html_entity_decode"))
 return html_entity_decode($string);
-$string = preg_replace('~&#x([0-9a-f]+);~ei', 'chr(hexdec("\\1"))', $string);
-$string = preg_replace('~&#([0-9]+);~e', 'chr("\\1")', $string);
+$string = preg_replace_callback('~&#x([0-9a-f]+);~i', array( $this, '_UnHTMLEncode_chr_callback'), $string);
+$string = preg_replace_callback('~&#([0-9]+);~', array($this, '_UnHTMLEncode_chr_hexdec_callback'), $string); 
 $trans_tbl = get_html_translation_table(HTML_ENTITIES);
 $trans_tbl = array_flip($trans_tbl);
 return strtr($string, $trans_tbl);
+}
+function _UnHTMLEncode_chr_callback($match) {
+return chr(hexdec($match[1]));
+}
+function _UnHTMLEncode_chr_hexdec_callback($match) {
+return chr(hexdec($match[1]));
 }
 function Wikify($string) {
@@ -1384 +1393 @@
 else $value = @$default_array[$matches[1]];
 if (strlen(@$matches[2])) {
-foreach (split(".", substr($matches[2], 1)) as $index) {
+foreach (explode(".", substr($matches[2], 1)) as $index) { 
 if (is_array($value))
 $value = @$value[$index];