Merge remote-tracking branch 'origin/master'

phpmyadmin · Jul 30, 2013 · c1ef87f · c1ef87f
2 parents 543face + 23a63e3
commit c1ef87f
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 33 deletions.
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
@@ -881,9 +881,9 @@ private function _getMoveForwardButtonsForTableNavigation(
      * Prepare fields for table navigation
      * Number of rows
      *
-     * @param string  $html_sql_query            the sql encoded by html special
-     *                                           characters
-     * @param string  $id_for_direction_dropdown the id for the direction dropdown
+     * @param string $html_sql_query            the sql encoded by html special
+     *                                          characters
+     * @param string $id_for_direction_dropdown the id for the direction dropdown
      *
      * @return  string  $additional_fields_html html content
      *

diff --git a/libraries/File.class.php b/libraries/File.class.php
@@ -247,7 +247,7 @@ public function setUploadedFile($name)
      * Loads uploaded file from table change request.
      *
      * @param string $key       the md5 hash of the column name
-     * @param string $rownumber
+     * @param string $rownumber number of row to process
      *
      * @return boolean success
      * @access  public
@@ -320,8 +320,8 @@ public function setUploadedFromTblChangeRequest($key, $rownumber)
      * </code>
      *
      * @param array  $file      the array
-     * @param string $rownumber
-     * @param string $key
+     * @param string $rownumber number of row to process
+     * @param string $key       key to process
      *
      * @return array
      * @access  public
@@ -345,7 +345,7 @@ public function fetchUploadedFromTblChangeRequestMultiple(
      * sets the name if the file to the one selected in the tbl_change form
      *
      * @param string $key       the md5 hash of the column name
-     * @param string $rownumber
+     * @param string $rownumber number of row to process
      *
      * @return boolean success
      * @access  public
@@ -391,7 +391,7 @@ public function isError()
      * and uses the submitted/selected file
      *
      * @param string $key       the md5 hash of the column name
-     * @param string $rownumber
+     * @param string $rownumber number of row to process
      *
      * @return boolean success
      * @access  public

diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php
@@ -1378,10 +1378,10 @@ function getReplacePreview($columnIndex, $find, $replaceWith, $charSet)
     /**
      * Replaces a given string in a column with a give replacement
      *
-     * @param int    $columnIndex  index of the column
-     * @param string $find         string to find in the column
-     * @param string $replaceWith  string to replace with
-     * @param string $charSet      character set of the connection
+     * @param int    $columnIndex index of the column
+     * @param string $find        string to find in the column
+     * @param string $replaceWith string to replace with
+     * @param string $charSet     character set of the connection
      *
      * @return void
      */

diff --git a/libraries/config.values.php b/libraries/config.values.php
@@ -32,7 +32,7 @@
         'only_db'      => 'array'
     )
 );
-$cfg_db['RecodingEngine'] = array('auto', 'iconv', 'recode', 'none');
+$cfg_db['RecodingEngine'] = array('auto', 'iconv', 'recode', 'mb', 'none');
 $cfg_db['OBGzip'] = array('auto', true, false);
 $cfg_db['MemoryLimit'] = 'short_string';
 $cfg_db['NavigationLogoLinkWindow'] = array('main', 'new');

diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
@@ -47,8 +47,8 @@ class Form
     /**
      * Constructor, reads default config values
      *
-     * @param string $form_name
-     * @param array  $form
+     * @param string $form_name Form name
+     * @param array  $form      Form data
      * @param int    $index     arbitrary index, stored in Form::$index
      */
     public function __construct($form_name, array $form, $index = null)

diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
@@ -459,8 +459,8 @@ public function fixErrors()
     /**
      * Validates select field and casts $value to correct type
      *
-     * @param string $value
-     * @param array  $allowed
+     * @param string &$value  Current value
+     * @param array  $allowed List of allowed values
      *
      * @return bool
      */
@@ -743,8 +743,8 @@ private function _loadUserprefsInfo()
     /**
      * Sets field comments and warnings based on current environment
      *
-     * @param string $system_path
-     * @param array  $opts
+     * @param string $system_path Path to settings
+     * @param array  &$opts       Chosen options
      *
      * @return void
      */
@@ -766,6 +766,13 @@ private function _setComments($system_path, array &$opts)
                     'recode', 'recode'
                 );
             }
+            if (!function_exists('mb_convert_encoding')) {
+                $opts['values']['mb'] .= ' (' . __('unavailable') . ')';
+                $comment .= ($comment ? ", " : '') . sprintf(
+                    __('"%s" requires %s extension'),
+                    'mb', 'mbstring'
+                );
+            }
             $opts['comment'] = $comment;
             $opts['comment_warning'] = true;
         }

diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
@@ -35,9 +35,9 @@ function PMA_lang($lang_key, $args = null)
 /**
  * Returns translated field name/description or comment
  *
- * @param string $canonical_path
+ * @param string $canonical_path path to handle
  * @param string $type           'name', 'desc' or 'cmt'
- * @param mixed  $default
+ * @param mixed  $default        default value
  *
  * @return string
  */

diff --git a/libraries/create_addfield.lib.php b/libraries/create_addfield.lib.php
@@ -50,6 +50,7 @@ function PMA_getIndexedColumns()
  * add columns to a existing table
  *
  * @param int     $field_cnt     number of columns
+ * @param int     $field_primary primary index field
  * @param boolean $is_create_tbl true if requirement is to get the statement
  *                               for table creation
  *

diff --git a/libraries/tbl_gis_visualization.lib.php b/libraries/tbl_gis_visualization.lib.php
@@ -189,10 +189,10 @@ function PMA_GIS_saveToFile($data, $visualizationSettings, $format, $fileName)
 /**
  * Function to get html for the options lists
  *
- * @param array    $options    array of options
- * @param String   $select     the item that shoul be selected by default
+ * @param array  $options array of options
+ * @param string $select  the item that shoul be selected by default
  *
- * @return string  $html       the html for the options lists
+ * @return string $html   the html for the options lists
  */
 function PMA_getHtmlForOptionsList($options, $select)
 {
@@ -211,11 +211,12 @@ function PMA_getHtmlForOptionsList($options, $select)
 /**
  * Function to get html for the lebel column and spatial column
  *
- * @param  String  $column                the column type. i.e either "labelColumn"
- *                                        or "spatialColumn"
- * @param  array   $columnCandidates      the list of select options
- * @param  array   $visualizationSettings visualization settings
- * @return String  $html
+ * @param string $column                the column type. i.e either "labelColumn"
+ *                                      or "spatialColumn"
+ * @param array  $columnCandidates      the list of select options
+ * @param array  $visualizationSettings visualization settings
+ *
+ * @return string  $html
  */
 function PMA_getHtmlForColumn($column, $columnCandidates, $visualizationSettings)
 {
@@ -243,7 +244,7 @@ function PMA_getHtmlForColumn($column, $columnCandidates, $visualizationSettings
 /**
  * Function to get html for the option of using oprn street maps
  *
- * @param  boolean $isSelected    the default value
+ * @param boolean $isSelected    the default value
  *
  * @return string  $html
  */

diff --git a/test/libraries/PMA_mime_test.php b/test/libraries/PMA_mime_test.php
@@ -17,8 +17,8 @@ class PMA_MIME_Test extends PHPUnit_Framework_TestCase
     /**
      * Test for PMA_detectMIME
      *
-     * @param string $test
-     * @param $output
+     * @param string $test   MIME to test
+     * @param string $output Expected output
      *
      * @return void
      * @dataProvider providerForTestDetectMIME

diff --git a/test/libraries/PMA_zip_test.php b/test/libraries/PMA_zip_test.php
@@ -55,7 +55,7 @@ public function testSetDoWrite()
     /**
      * Test for unix2DosTime
      *
-     * @param int $unixtime UNIX timestamp
+     * @param int $unixTime UNIX timestamp
      * @param int $output   DOS timestamp
      *
      * @dataProvider providerForTestUnix2DosTime