UPDATE phpmyadmin 4.2.6 multilanguage

1 files changed, 15 insertions, 0 deletions

diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index 3a88ec0661..87610a6fc4 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -9,6 +9,20 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+/**
+ * Generate charset dropdown box
+ *
+ * @param int         $type               Type
+ * @param null|string $name               Element name
+ * @param null|string $id                 Element id
+ * @param null|string $default            Default value
+ * @param bool        $label              Label
+ * @param int         $indent             Indent
+ * @param bool        $submitOnChange     Submit on change
+ * @param bool        $displayUnavailable Display unavailable
+ *
+ * @return string
+ */
 function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION,
     $name = null, $id = null, $default = null, $label = true, $indent = 0,
     $submitOnChange = false, $displayUnavailable = false
@@ -244,6 +258,7 @@ function PMA_getCollationDescr($collation)
         break;
     case 'bin':
         $is_bin = true;
+        // no break; statement here, continuing with 'general' section:
     case 'general':
         switch ($parts[0]) {
         // Unicode charsets