mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-18 21:39:52 +02:00
use already parsed size tags only - else it will eventually wrongly adjust size tags in code blocks.
git-svn-id: file:///svn/phpbb/trunk@7165 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
0ba68eebac
commit
8c43f10b3d
@ -1148,6 +1148,15 @@ function phpbb_prepare_message($message)
|
||||
// Decode phpBB 2.0.x Message
|
||||
if (isset($convert->row['old_bbcode_uid']) && $convert->row['old_bbcode_uid'] != '')
|
||||
{
|
||||
// Adjust size...
|
||||
if (strpos($message, '[size=') !== false)
|
||||
{
|
||||
// Doing it with a map.
|
||||
$match_size = array('/\[size=[0-7]:' . $convert->row['old_bbcode_uid'] . '\]/', '/\[size=[8-9]:' . $convert->row['old_bbcode_uid'] . '\]/', '/\[size=[10-12]:' . $convert->row['old_bbcode_uid'] . '\]/', '/\[size=[13-18]:' . $convert->row['old_bbcode_uid'] . '\]/', '/\[size=[19-99]:' . $convert->row['old_bbcode_uid'] . '\]/');
|
||||
$replace_size = array('[size=50:' . $convert->row['old_bbcode_uid'] . ']', '[size=85:' . $convert->row['old_bbcode_uid'] . ']', '[size=100:' . $convert->row['old_bbcode_uid'] . ']', '[size=150:' . $convert->row['old_bbcode_uid'] . ']', '[size=200:' . $convert->row['old_bbcode_uid'] . ']');
|
||||
$message = preg_replace($match_size, $replace_size, $message);
|
||||
}
|
||||
|
||||
$message = preg_replace('/\:(([a-z0-9]:)?)' . $convert->row['old_bbcode_uid'] . '/s', '', $message);
|
||||
}
|
||||
|
||||
@ -1156,15 +1165,6 @@ function phpbb_prepare_message($message)
|
||||
$message = preg_replace('/\[quote="(.*?)"\]/s', '[quote="\1"]', $message);
|
||||
}
|
||||
|
||||
// Adjust size...
|
||||
if (strpos($message, '[size=') !== false)
|
||||
{
|
||||
// Doing it with a map.
|
||||
$match_size = array('/\[size=[0-7]\]/', '/\[size=[8-9]\]/', '/\[size=[10-12]\]/', '/\[size=[13-18]\]/', '/\[size=[19-99]\]/');
|
||||
$replace_size = array('[size=50]', '[size=85]', '[size=100]', '[size=150]', '[size=200]');
|
||||
$message = preg_replace($match_size, $replace_size, $message);
|
||||
}
|
||||
|
||||
// Already the new user id ;)
|
||||
$user_id = $convert->row['poster_id'];
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user