diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-10 15:58:17 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-10 15:58:17 +0000 |
| commit | 8c43f10b3da9d51165d5129e2ae7a605bf6b7647 (patch) | |
| tree | 094aa983c7258295391a45077ae69f1476c71cff /phpBB/install/convertors | |
| parent | 0ba68eebac065c77211bc2f71b5580c123122015 (diff) | |
| download | forums-8c43f10b3da9d51165d5129e2ae7a605bf6b7647.tar forums-8c43f10b3da9d51165d5129e2ae7a605bf6b7647.tar.gz forums-8c43f10b3da9d51165d5129e2ae7a605bf6b7647.tar.bz2 forums-8c43f10b3da9d51165d5129e2ae7a605bf6b7647.tar.xz forums-8c43f10b3da9d51165d5129e2ae7a605bf6b7647.zip | |
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
Diffstat (limited to 'phpBB/install/convertors')
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 25887b2f8e..fee6f1f7a8 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -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']; |