diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-07 17:25:47 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-07 17:25:47 +0000 |
| commit | 8f4c3a1feeb04cc5b5a613472e14be1b98bf493c (patch) | |
| tree | 8c29e5d62a6adf386a35f49d9b3d29a9ec9d88f2 /phpBB/install | |
| parent | ec7936509ac13ff99ff1d43ce3850d7110313f74 (diff) | |
| download | forums-8f4c3a1feeb04cc5b5a613472e14be1b98bf493c.tar forums-8f4c3a1feeb04cc5b5a613472e14be1b98bf493c.tar.gz forums-8f4c3a1feeb04cc5b5a613472e14be1b98bf493c.tar.bz2 forums-8f4c3a1feeb04cc5b5a613472e14be1b98bf493c.tar.xz forums-8f4c3a1feeb04cc5b5a613472e14be1b98bf493c.zip | |
some fixes...
git-svn-id: file:///svn/phpbb/trunk@6854 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 1 | ||||
| -rw-r--r-- | phpBB/install/install_convert.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 28d255b210..a30930ed5b 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -813,6 +813,7 @@ if (!$get_info) array('user_icq', 'users.user_icq', ''), array('user_from', 'users.user_from', 'utf8_htmlspecialchars'), array('user_rank', 'users.user_rank', ''), + array('user_permissions', '', ''), array('user_avatar', 'users.user_avatar', 'phpbb_import_avatar'), array('user_avatar_type', 'users.user_avatar_type', 'phpbb_avatar_type'), diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index f9e2583294..61096f5b86 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -893,7 +893,7 @@ class install_convert extends module $template->assign_block_vars('checks', array( 'TITLE' => "skip_rows = $skip_rows", - 'RESULT' => $rows . ((defined('DEBUG_EXTRA')) ? ceil(memory_get_usage()/1024) . ' KB' : ''), + 'RESULT' => $rows . ((defined('DEBUG_EXTRA') && function_exists('memory_get_usage')) ? ceil(memory_get_usage()/1024) . ' KB' : ''), )); $mtime = explode(' ', microtime()); @@ -1125,7 +1125,7 @@ class install_convert extends module sync('topic', 'range', 'topic_id BETWEEN ' . $sync_batch . ' AND ' . $end, true, true); $template->assign_block_vars('checks', array( - 'TITLE' => sprintf($user->lang['SYNC_TOPIC_ID'], $sync_batch, ($sync_batch + $batch_size)) . ((defined('DEBUG_EXTRA')) ? ' [' . ceil(memory_get_usage()/1024) . ' KB]' : ''), + 'TITLE' => sprintf($user->lang['SYNC_TOPIC_ID'], $sync_batch, ($sync_batch + $batch_size)) . ((defined('DEBUG_EXTRA') && function_exists('memory_get_usage')) ? ' [' . ceil(memory_get_usage()/1024) . ' KB]' : ''), 'RESULT' => $user->lang['DONE'], )); |