From 8ec765a8bce231285b109c1209cb3b303816cb1b Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 14 May 2012 13:26:40 -0400
Subject: [PATCH] Improve function name

---
 libraries/common.lib.php                                    | 6 +++---
 libraries/sql_query_form.lib.php                            | 2 +-
 tbl_change.php                                              | 2 +-
 ..._test.php => PMA_getFormattedMaximumUploadSize_test.php} | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename test/libraries/common/{PMA_displayMaximumUploadSize_test.php => PMA_getFormattedMaximumUploadSize_test.php} (81%)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 90e3d4ab33..6c53abf628 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -179,7 +179,7 @@ function PMA_getImage($image, $alternate = '', $attributes = array())
 }
 
 /**
- * Displays the maximum size for an upload
+ * Returns the formatted maximum size for an upload
  *
  * @param integer $max_upload_size the size
  *
@@ -187,7 +187,7 @@ function PMA_getImage($image, $alternate = '', $attributes = array())
  *
  * @access  public
  */
-function PMA_displayMaximumUploadSize($max_upload_size)
+function PMA_getFormattedMaximumUploadSize($max_upload_size)
 {
     // I have to reduce the second parameter (sensitiveness) from 6 to 4
     // to avoid weird results like 512 kKib
@@ -3312,7 +3312,7 @@ function PMA_browseUploadFile($max_upload_size)
     echo '<div id="upload_form_status" style="display: none;"></div>';
     echo '<div id="upload_form_status_info" style="display: none;"></div>';
     echo '<input type="file" name="import_file" id="input_import_file" />';
-    echo PMA_displayMaximumUploadSize($max_upload_size) . "\n";
+    echo PMA_getFormattedMaximumUploadSize($max_upload_size) . "\n";
     // some browsers should respect this :)
     echo PMA_generateHiddenMaxFileSize($max_upload_size) . "\n";
 }
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index ff5c1d3b77..c3c81e0eab 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -442,7 +442,7 @@ function PMA_sqlQueryFormUpload()
     echo __('Browse your computer:') . '</legend>';
     echo '<div class="formelement">';
     echo '<input type="file" name="sql_file" class="textfield" /> ';
-    echo PMA_displayMaximumUploadSize($GLOBALS['max_upload_size']);
+    echo PMA_getFormattedMaximumUploadSize($GLOBALS['max_upload_size']);
     // some browsers should respect this :)
     echo PMA_generateHiddenMaxFileSize($GLOBALS['max_upload_size']) . "\n";
     echo '</div>';
diff --git a/tbl_change.php b/tbl_change.php
index e60185e0d6..92c728ad6e 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -918,7 +918,7 @@ foreach ($rows as $row_id => $vrow) {
                 if ($this_field_max_size > $max_field_sizes[$field['pma_type']]) {
                     $this_field_max_size = $max_field_sizes[$field['pma_type']];
                 }
-                echo PMA_displayMaximumUploadSize($this_field_max_size) . "\n";
+                echo PMA_getFormattedMaximumUploadSize($this_field_max_size) . "\n";
                 // do not generate here the MAX_FILE_SIZE, because we should
                 // put only one in the form to accommodate the biggest field
                 if ($this_field_max_size > $biggest_max_file_size) {
diff --git a/test/libraries/common/PMA_displayMaximumUploadSize_test.php b/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
similarity index 81%
rename from test/libraries/common/PMA_displayMaximumUploadSize_test.php
rename to test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
index 27860290c3..952c439cb3 100644
--- a/test/libraries/common/PMA_displayMaximumUploadSize_test.php
+++ b/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test for PMA_displayMaximumUploadSize from common.lib.php
+ * Test for PMA_getFormattedMaximumUploadSize from common.lib.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -12,7 +12,7 @@
  */
 require_once 'libraries/common.lib.php';
 
-class PMA_displayMaximumUploadSize_test extends PHPUnit_Framework_TestCase
+class PMA_getFormattedMaximumUploadSize_test extends PHPUnit_Framework_TestCase
 {
 
     /*
@@ -37,7 +37,7 @@ class PMA_displayMaximumUploadSize_test extends PHPUnit_Framework_TestCase
      */
     function testMaximumUploadSize($size, $unit, $res)
     {
-        $this->assertEquals("(" . __('Max: '). $res . $unit .")", PMA_displayMaximumUploadSize($size));
+        $this->assertEquals("(" . __('Max: '). $res . $unit .")", PMA_getFormattedMaximumUploadSize($size));
 
     }
 }