mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations
git-svn-id: file:///svn/phpbb/trunk@2532 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -251,7 +251,7 @@ function bbencode_first_pass($text, $uid)
|
||||
// [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff.
|
||||
$text = bbencode_first_pass_pda($text, $uid, '[quote]', '[/quote]', '', false, '');
|
||||
|
||||
$text = bbencode_first_pass_pda($text, $uid, '/\[quote=(\\\\".*?\\\\")\]/is', '[/quote]', '', false, '', "[quote:$uid=\\1]");
|
||||
$text = bbencode_first_pass_pda($text, $uid, '/\[quote=(\\\\"[^"]*?\\\\")\]/is', '[/quote]', '', false, '', "[quote:$uid=\\1]");
|
||||
|
||||
// [list] and [list=x] for (un)ordered lists.
|
||||
$open_tag = array();
|
||||
@@ -433,7 +433,13 @@ function bbencode_first_pass_pda($text, $uid, $open_tag, $close_tag, $close_tag_
|
||||
// Push its position, the text we matched, and its index in the open_tag array on to the stack, and then keep going to the right.
|
||||
$match = array("pos" => $curr_pos, "tag" => $which_start_tag, "index" => $start_tag_index);
|
||||
bbcode_array_push($stack, $match);
|
||||
++$curr_pos;
|
||||
//
|
||||
// Rather than just increment $curr_pos
|
||||
// Set it to the ending of the tag we just found
|
||||
// Keeps error in nested tag from breaking out
|
||||
// of table structure..
|
||||
//
|
||||
$curr_pos = $curr_pos + strlen($possible_start);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user