diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-03-12 09:43:14 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-03-12 09:43:14 +0000 |
| commit | 47a3bc1b081f0aa8766f87b51c8d25db75c203a8 (patch) | |
| tree | 4e40f227a766754896ac09013a29733115d5196d /phpBB/install | |
| parent | 51088c46fb5cb5c36759a91f6a7229b28f2df0d1 (diff) | |
| download | forums-47a3bc1b081f0aa8766f87b51c8d25db75c203a8.tar forums-47a3bc1b081f0aa8766f87b51c8d25db75c203a8.tar.gz forums-47a3bc1b081f0aa8766f87b51c8d25db75c203a8.tar.bz2 forums-47a3bc1b081f0aa8766f87b51c8d25db75c203a8.tar.xz forums-47a3bc1b081f0aa8766f87b51c8d25db75c203a8.zip | |
- correct size conversion (px to percentage)
git-svn-id: file:///svn/phpbb/trunk@7172 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index e4f2a88013..26f5407915 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1131,6 +1131,11 @@ function phpbb_convert_topic_type($topic_type) return POST_NORMAL; } +function phpbb_replace_size($matches) +{ + return '[size=' . ceil(100.0 * (((double) $matches[1])/12.0)) . ':' . $matches[2] . ']'; +} + /** * Reparse the message stripping out the bbcode_uid values and adding new ones and setting the bitfield * @todo What do we want to do about HTML in messages - currently it gets converted to the entities, but there may be some objections to this @@ -1151,10 +1156,7 @@ function phpbb_prepare_message($message) // 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=1[0-2]:' . $convert->row['old_bbcode_uid'] . '\]/', '/\[size=1[3-8]:' . $convert->row['old_bbcode_uid'] . '\]/', '/\[size=(?:[2-9][0-9]|19):' . $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_callback('/\[size=(\d*):' . $bbcode_uid . '\]/', 'replace_size', $message); } $message = preg_replace('/\:(([a-z0-9]:)?)' . $convert->row['old_bbcode_uid'] . '/s', '', $message); |