Changeset 3748954 for bbpress/branches/2.6/includes/admin/parser.php

Timestamp:

10/15/2026 04:34:30 PM (2 weeks ago)

Author:

johnjamesjacoby

Message:

bbPress: deploy 2.6.20 and its Playground preview.

File:

• bbpress/branches/2.6/includes/admin/parser.php (modified) (15 diffs)

bbpress/branches/2.6/includes/admin/parser.php

@@ -137 +137 @@
 }
 else {
-switch (ord(substr($this->text, 0, 1))) {
+switch (ord(substr($text, 0, 1))) {
 case 10:
 case 13:
@@ -795 +795 @@
 if ($action == BBCODE_CHECK)
 return strlen($name) > 0;
-$title = trim(@$params['title']);
+$title = isset($params['title']) ? trim($params['title']) : '';
 if (strlen($title) <= 0) $title = trim($default);
 return "<a href=\"{$bbcode->wiki_url}$name\" class=\"bbcode_wiki\">"
@@ -807 +807 @@
 if (!preg_match("/(?:\\/\\.\\.\\/)|(?:^\\.\\.\\/)|(?:^\\/)/", $content)) {
 $info = @getimagesize("{$bbcode->local_img_dir}/{$content}");
-if ($info[2] == IMAGETYPE_GIF || $info[2] == IMAGETYPE_JPEG || $info[2] == IMAGETYPE_PNG) {
+if (is_array($info) && ($info[2] == IMAGETYPE_GIF || $info[2] == IMAGETYPE_JPEG || $info[2] == IMAGETYPE_PNG)) {
 return "<img src=\""
 . htmlspecialchars("{$bbcode->local_img_url}/{$content}") . "\" alt=\""
@@ -869 +869 @@
 'square' => 'square',
 );
-$default = trim($default);
+$default = trim((string) $default);
 if ($action == BBCODE_CHECK) {
-if (!is_string($default) || strlen($default) == "") return true;
+if ($default === '') return true;
 else if (isset($list_styles[$default])) return true;
 else if (isset($ci_list_styles[strtolower($default)])) return true;
 else return false;
 }
-if (!is_string($default) || strlen($default) == "") {
+if ($default === '') {
 $elem = 'ul';
 $type = '';
 }
-else if ($default == '1') {
+else if ($default === '1') {
 $elem = 'ol';
 $type = '';
@@ -1010 +1010 @@
 var $smileys;
 var $smiley_regex;
+var $smiley_info;
 var $enable_smileys;
 var $wiki_url;
@@ -1020 +1021 @@
 var $post_trim;
 var $debug;
+var $lexer;
+var $stack;
 
 
@@ -1035 +1038 @@
         $this->enable_smileys = true;
         $this->smiley_regex = false;
+        $this->smiley_info = Array();
         $this->smiley_dir = $this->GetDefaultSmileyDir();
         $this->smiley_url = $this->GetDefaultSmileyURL();
@@ -1047 +1051 @@
         $this->start_tags = Array();
         $this->tag_marker = '[';
-        $this->allow_ampsersand = false;
+        $this->allow_ampersand = false;
         $this->current_class = $this->root_class;
         $this->debug = false;
@@ -1283 +1287 @@
 else {
 $info = @getimagesize($this->smiley_dir . '/' . $this->smileys[$token]);
+$info = is_array($info) ? $info : Array('', '');
 $this->smiley_info[$token] = $info;
 }
@@ -1567 +1572 @@
 }
 function Internal_CleanupWSByPoppingStack($pattern, &$array) {
-if (strlen($pattern) <= 0) return;
+if (empty($pattern)) return;
 $oldlen = count($array);
 foreach (str_split($pattern) as $char) {
@@ -1592 +1597 @@
 }
 function Internal_CleanupWSByEatingInput($pattern) {
-if (strlen($pattern) <= 0) return;
+if (empty($pattern)) return;
 foreach (str_split($pattern) as $char) {
 switch ($char) {
@@ -1618 +1623 @@
 }
 function Internal_CleanupWSByIteratingPointer($pattern, $pos, $array) {
-if (strlen($pattern) <= 0) return $pos;
+if (empty($pattern)) return $pos;
 foreach (str_split($pattern) as $char) {
 switch ($char) {
@@ -1848 +1853 @@
 if ($token_type == BBCODE_EOI) {
 $this->lexer->RestoreState($state);
+array_splice($this->stack, $start);
+$this->Internal_ComputeCurrentClass();
 $this->stack[] = Array(
 BBCODE_STACK_TOKEN => BBCODE_TEXT,
@@ -1863 +1870 @@
 $this->Internal_ComputeCurrentClass();
 $this->Internal_CleanupWSByPoppingStack(@$tag_rule['before_tag'], $this->stack);
-$tag_params['_endtag'] = $end_tag_params['_tag'];
+$tag_params['_endtag'] = $end_tag;
 $tag_params['_hasend'] = true;
 $output = $this->DoTag(BBCODE_OUTPUT, $tag_name,
@@ -1966 +1973 @@
 }
 function Parse($string) {
+$string = (string) $string;
 $this->lexer = new BBCodeLexer($string, $this->tag_marker);
 $this->lexer->debug = $this->debug;