diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-02-23 14:23:34 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-02-23 14:23:34 +0000 |
| commit | 2cedbbac0944da85a01f3a3afbac65756610f29d (patch) | |
| tree | a2302e0bfabf2800b44870c8b14d3c75a12dc612 /phpBB/adm | |
| parent | 6dc85449c1feaed312bc25bbe624305f29e40036 (diff) | |
| download | forums-2cedbbac0944da85a01f3a3afbac65756610f29d.tar forums-2cedbbac0944da85a01f3a3afbac65756610f29d.tar.gz forums-2cedbbac0944da85a01f3a3afbac65756610f29d.tar.bz2 forums-2cedbbac0944da85a01f3a3afbac65756610f29d.tar.xz forums-2cedbbac0944da85a01f3a3afbac65756610f29d.zip | |
merge revisions #r8384, #r8387, #r8388, #r8389 and #r8390
git-svn-id: file:///svn/phpbb/trunk@8391 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/index.php | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_database.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index a3b173ac7a..0932e01aa1 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -184,7 +184,7 @@ function adm_page_footer($copyright_html = true) { global $base_memory_usage; $memory_usage -= $base_memory_usage; - $memory_usage = ($memory_usage >= 1048576) ? round((round($memory_usage / 1048576 * 100) / 100), 2) . ' ' . $user->lang['MB'] : (($memory_usage >= 1024) ? round((round($memory_usage / 1024 * 100) / 100), 2) . ' ' . $user->lang['KB'] : $memory_usage . ' ' . $user->lang['BYTES']); + $memory_usage = get_formatted_filesize($memory_usage); $debug_output .= ' | Memory Usage: ' . $memory_usage; } diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index 8165efe9a2..e64c5ed437 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -77,7 +77,7 @@ <option value="{tables.TABLE}">{tables.TABLE}</option> <!-- END tables --> </select></dd> - <dd><a href="#" onclick="selector(true)">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false)">{L_DESELECT_ALL}</a></dd> + <dd><a href="#" onclick="selector(true); return false;">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false); return false;">{L_DESELECT_ALL}</a></dd> </dl> <p class="submit-buttons"> |