From 26021f05f830d91ba24a68045a572e109225a9e1 Mon Sep 17 00:00:00 2001
From: shamika <shamikadineshdha@gmail.com>
Date: Sun, 24 Feb 2013 13:02:14 +0530
Subject: [PATCH 1/5] Bug Fix:#3813 grid editing utf8 set/enum value

---
 libraries/Util.class.php |  2 +-
 sql.php                  | 23 ++++++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 5155564a31..7f1d276928 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -4036,7 +4036,7 @@ class PMA_Util
      */
     public static function parseEnumSetValues($definition)
     {
-        $values_string = htmlentities($definition);
+        $values_string = htmlentities($definition,ENT_COMPAT, "UTF-8");
         // There is a JS port of the below parser in functions.js
         // If you are fixing something here,
         // you need to also update the JS port.
diff --git a/sql.php b/sql.php
index ac1114351e..1a4d584f63 100644
--- a/sql.php
+++ b/sql.php
@@ -222,12 +222,25 @@ if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
     $values = PMA_Util::parseEnumSetValues($field_info_result[0]['Type']);
 
     $select = '';
-    foreach ($values as $value) {
-        $select .= '<option value="' . $value . '"';
-        if (in_array($value, $selected_values, true)) {
-            $select .= ' selected="selected"';
+       
+//    foreach ($values as $value) {
+//        $select .= '<option value="' . $value . '"';
+//        if (in_array($value, $selected_values, true)) {
+//            $select .= ' selected="selected"';
+//        }
+//        $select .= '>' . $value . '</option>';
+//    }
+    
+    //converts characters of $_REQUEST['curr_value'] to HTML entities 
+    $converted_curr_value=htmlentities($_REQUEST['curr_value'],ENT_COMPAT, "UTF-8");
+    
+    foreach ($values as $value) {       
+        
+        $select .= '<option value="' . $value . '" ';
+        if ( $value == $converted_curr_value) {
+            $select .= 'selected';
         }
-        $select .= '>' . $value . '</option>';
+        $select .= ' >' . $value. '</option>';
     }
 
     $select_size = (sizeof($values) > 10) ? 10 : sizeof($values);

From 071e3ad50a699c122891103d01d8a6db4811a481 Mon Sep 17 00:00:00 2001
From: shamika <shamikadineshdha@gmail.com>
Date: Sun, 24 Feb 2013 20:45:53 +0530
Subject: [PATCH 2/5] Bug Fix:#3813 grid editing utf8 set/enum value-resubmit
 with correcing errors

---
 sql.php | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/sql.php b/sql.php
index 1a4d584f63..3434c1421c 100644
--- a/sql.php
+++ b/sql.php
@@ -223,25 +223,21 @@ if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
 
     $select = '';
        
-//    foreach ($values as $value) {
-//        $select .= '<option value="' . $value . '"';
-//        if (in_array($value, $selected_values, true)) {
-//            $select .= ' selected="selected"';
-//        }
-//        $select .= '>' . $value . '</option>';
-//    }
-    
-    //converts characters of $_REQUEST['curr_value'] to HTML entities 
+	//converts characters of $_REQUEST['curr_value'] to HTML entities 
     $converted_curr_value=htmlentities($_REQUEST['curr_value'],ENT_COMPAT, "UTF-8");
     
-    foreach ($values as $value) {       
-        
-        $select .= '<option value="' . $value . '" ';
-        if ( $value == $converted_curr_value) {
-            $select .= 'selected';
-        }
-        $select .= ' >' . $value. '</option>';
+    //To prevent from, omiting current selected value. 
+    if ( ! in_array($converted_curr_value, $values, TRUE)) {
+        $values[] = $converted_curr_value;
     }
+    
+    foreach ($values as $value) {       
+        $select .= '<option value="' . $value . '"';
+        if ($value == $converted_curr_value) {
+            $select .= ' selected ';
+        }
+        $select .= '>' . $value. '</option>';
+    }  
 
     $select_size = (sizeof($values) > 10) ? 10 : sizeof($values);
     $select = '<select multiple="multiple" size="' . $select_size . '">'

From 5b01f2977a089ea19488672aef41402481ed9f13 Mon Sep 17 00:00:00 2001
From: shamika <shamikadineshdha@gmail.com>
Date: Mon, 25 Feb 2013 16:42:55 +0530
Subject: [PATCH 3/5] =?UTF-8?q?=20Bug=20Fix:#3813=20grid=20editing=20utf8?=
 =?UTF-8?q?=20set/enum=20value-resubmit=20with=20correcin=E2=80=A6=20?=
 =?UTF-8?q?=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 patch.diff | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 sql.php    |  13 ++----
 2 files changed, 120 insertions(+), 9 deletions(-)
 create mode 100644 patch.diff

diff --git a/patch.diff b/patch.diff
new file mode 100644
index 0000000000..0f844f046e
--- /dev/null
+++ b/patch.diff
@@ -0,0 +1,116 @@
+From 26021f05f830d91ba24a68045a572e109225a9e1 Mon Sep 17 00:00:00 2001
+From: shamika <shamikadineshdha@gmail.com>
+Date: Sun, 24 Feb 2013 13:02:14 +0530
+Subject: [PATCH 1/2] Bug Fix:#3813 grid editing utf8 set/enum value
+
+---
+ libraries/Util.class.php |  2 +-
+ sql.php                  | 23 ++++++++++++++++++-----
+ 2 files changed, 19 insertions(+), 6 deletions(-)
+
+diff --git a/libraries/Util.class.php b/libraries/Util.class.php
+index 5155564..7f1d276 100644
+--- a/libraries/Util.class.php
++++ b/libraries/Util.class.php
+@@ -4036,7 +4036,7 @@ class PMA_Util
+      */
+     public static function parseEnumSetValues($definition)
+     {
+-        $values_string = htmlentities($definition);
++        $values_string = htmlentities($definition,ENT_COMPAT, "UTF-8");
+         // There is a JS port of the below parser in functions.js
+         // If you are fixing something here,
+         // you need to also update the JS port.
+diff --git a/sql.php b/sql.php
+index ac11143..1a4d584 100644
+--- a/sql.php
++++ b/sql.php
+@@ -222,12 +222,25 @@ if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
+     $values = PMA_Util::parseEnumSetValues($field_info_result[0]['Type']);
+ 
+     $select = '';
+-    foreach ($values as $value) {
+-        $select .= '<option value="' . $value . '"';
+-        if (in_array($value, $selected_values, true)) {
+-            $select .= ' selected="selected"';
++       
++//    foreach ($values as $value) {
++//        $select .= '<option value="' . $value . '"';
++//        if (in_array($value, $selected_values, true)) {
++//            $select .= ' selected="selected"';
++//        }
++//        $select .= '>' . $value . '</option>';
++//    }
++    
++    //converts characters of $_REQUEST['curr_value'] to HTML entities 
++    $converted_curr_value=htmlentities($_REQUEST['curr_value'],ENT_COMPAT, "UTF-8");
++    
++    foreach ($values as $value) {       
++        
++        $select .= '<option value="' . $value . '" ';
++        if ( $value == $converted_curr_value) {
++            $select .= 'selected';
+         }
+-        $select .= '>' . $value . '</option>';
++        $select .= ' >' . $value. '</option>';
+     }
+ 
+     $select_size = (sizeof($values) > 10) ? 10 : sizeof($values);
+-- 
+1.7.11.msysgit.1
+
+
+From 071e3ad50a699c122891103d01d8a6db4811a481 Mon Sep 17 00:00:00 2001
+From: shamika <shamikadineshdha@gmail.com>
+Date: Sun, 24 Feb 2013 20:45:53 +0530
+Subject: [PATCH 2/2] Bug Fix:#3813 grid editing utf8 set/enum value-resubmit
+ with correcing errors
+
+---
+ sql.php | 26 +++++++++++---------------
+ 1 file changed, 11 insertions(+), 15 deletions(-)
+
+diff --git a/sql.php b/sql.php
+index 1a4d584..3434c14 100644
+--- a/sql.php
++++ b/sql.php
+@@ -223,25 +223,21 @@ if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
+ 
+     $select = '';
+        
+-//    foreach ($values as $value) {
+-//        $select .= '<option value="' . $value . '"';
+-//        if (in_array($value, $selected_values, true)) {
+-//            $select .= ' selected="selected"';
+-//        }
+-//        $select .= '>' . $value . '</option>';
+-//    }
+-    
+-    //converts characters of $_REQUEST['curr_value'] to HTML entities 
++	//converts characters of $_REQUEST['curr_value'] to HTML entities 
+     $converted_curr_value=htmlentities($_REQUEST['curr_value'],ENT_COMPAT, "UTF-8");
+     
++    //To prevent from, omiting current selected value. 
++    if ( ! in_array($converted_curr_value, $values, TRUE)) {
++        $values[] = $converted_curr_value;
++    }
++    
+     foreach ($values as $value) {       
+-        
+-        $select .= '<option value="' . $value . '" ';
+-        if ( $value == $converted_curr_value) {
+-            $select .= 'selected';
++        $select .= '<option value="' . $value . '"';
++        if ($value == $converted_curr_value) {
++            $select .= ' selected ';
+         }
+-        $select .= ' >' . $value. '</option>';
+-    }
++        $select .= '>' . $value. '</option>';
++    }  
+ 
+     $select_size = (sizeof($values) > 10) ? 10 : sizeof($values);
+     $select = '<select multiple="multiple" size="' . $select_size . '">'
+-- 
+1.7.11.msysgit.1
+
diff --git a/sql.php b/sql.php
index 3434c1421c..b563d670db 100644
--- a/sql.php
+++ b/sql.php
@@ -217,26 +217,21 @@ if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
         $field_info_query, null, null, null, PMA_DBI_QUERY_STORE
     );
 
-    $selected_values = explode(',', $_REQUEST['curr_value']);
-
     $values = PMA_Util::parseEnumSetValues($field_info_result[0]['Type']);
 
     $select = '';
        
 	//converts characters of $_REQUEST['curr_value'] to HTML entities 
     $converted_curr_value=htmlentities($_REQUEST['curr_value'],ENT_COMPAT, "UTF-8");
-    
-    //To prevent from, omiting current selected value. 
-    if ( ! in_array($converted_curr_value, $values, TRUE)) {
-        $values[] = $converted_curr_value;
-    }
+	
+	$selected_values = explode (',' , $_REQUEST['curr_value']);
     
     foreach ($values as $value) {       
         $select .= '<option value="' . $value . '"';
-        if ($value == $converted_curr_value) {
+        if ($value == $converted_curr_value || in_array($value , $selected_values , true)) {
             $select .= ' selected ';
         }
-        $select .= '>' . $value. '</option>';
+        $select .= '>' . $value . '</option>';
     }  
 
     $select_size = (sizeof($values) > 10) ? 10 : sizeof($values);

From 4df529c9c9c5eaec4b84151fd7881b7923a699d9 Mon Sep 17 00:00:00 2001
From: shamika <shamikadineshdha@gmail.com>
Date: Thu, 28 Feb 2013 09:12:07 +0530
Subject: [PATCH 4/5] remove the patch file

---
 patch.diff | 116 -----------------------------------------------------
 1 file changed, 116 deletions(-)
 delete mode 100644 patch.diff

diff --git a/patch.diff b/patch.diff
deleted file mode 100644
index 0f844f046e..0000000000
--- a/patch.diff
+++ /dev/null
@@ -1,116 +0,0 @@
-From 26021f05f830d91ba24a68045a572e109225a9e1 Mon Sep 17 00:00:00 2001
-From: shamika <shamikadineshdha@gmail.com>
-Date: Sun, 24 Feb 2013 13:02:14 +0530
-Subject: [PATCH 1/2] Bug Fix:#3813 grid editing utf8 set/enum value
-
----
- libraries/Util.class.php |  2 +-
- sql.php                  | 23 ++++++++++++++++++-----
- 2 files changed, 19 insertions(+), 6 deletions(-)
-
-diff --git a/libraries/Util.class.php b/libraries/Util.class.php
-index 5155564..7f1d276 100644
---- a/libraries/Util.class.php
-+++ b/libraries/Util.class.php
-@@ -4036,7 +4036,7 @@ class PMA_Util
-      */
-     public static function parseEnumSetValues($definition)
-     {
--        $values_string = htmlentities($definition);
-+        $values_string = htmlentities($definition,ENT_COMPAT, "UTF-8");
-         // There is a JS port of the below parser in functions.js
-         // If you are fixing something here,
-         // you need to also update the JS port.
-diff --git a/sql.php b/sql.php
-index ac11143..1a4d584 100644
---- a/sql.php
-+++ b/sql.php
-@@ -222,12 +222,25 @@ if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
-     $values = PMA_Util::parseEnumSetValues($field_info_result[0]['Type']);
- 
-     $select = '';
--    foreach ($values as $value) {
--        $select .= '<option value="' . $value . '"';
--        if (in_array($value, $selected_values, true)) {
--            $select .= ' selected="selected"';
-+       
-+//    foreach ($values as $value) {
-+//        $select .= '<option value="' . $value . '"';
-+//        if (in_array($value, $selected_values, true)) {
-+//            $select .= ' selected="selected"';
-+//        }
-+//        $select .= '>' . $value . '</option>';
-+//    }
-+    
-+    //converts characters of $_REQUEST['curr_value'] to HTML entities 
-+    $converted_curr_value=htmlentities($_REQUEST['curr_value'],ENT_COMPAT, "UTF-8");
-+    
-+    foreach ($values as $value) {       
-+        
-+        $select .= '<option value="' . $value . '" ';
-+        if ( $value == $converted_curr_value) {
-+            $select .= 'selected';
-         }
--        $select .= '>' . $value . '</option>';
-+        $select .= ' >' . $value. '</option>';
-     }
- 
-     $select_size = (sizeof($values) > 10) ? 10 : sizeof($values);
--- 
-1.7.11.msysgit.1
-
-
-From 071e3ad50a699c122891103d01d8a6db4811a481 Mon Sep 17 00:00:00 2001
-From: shamika <shamikadineshdha@gmail.com>
-Date: Sun, 24 Feb 2013 20:45:53 +0530
-Subject: [PATCH 2/2] Bug Fix:#3813 grid editing utf8 set/enum value-resubmit
- with correcing errors
-
----
- sql.php | 26 +++++++++++---------------
- 1 file changed, 11 insertions(+), 15 deletions(-)
-
-diff --git a/sql.php b/sql.php
-index 1a4d584..3434c14 100644
---- a/sql.php
-+++ b/sql.php
-@@ -223,25 +223,21 @@ if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
- 
-     $select = '';
-        
--//    foreach ($values as $value) {
--//        $select .= '<option value="' . $value . '"';
--//        if (in_array($value, $selected_values, true)) {
--//            $select .= ' selected="selected"';
--//        }
--//        $select .= '>' . $value . '</option>';
--//    }
--    
--    //converts characters of $_REQUEST['curr_value'] to HTML entities 
-+	//converts characters of $_REQUEST['curr_value'] to HTML entities 
-     $converted_curr_value=htmlentities($_REQUEST['curr_value'],ENT_COMPAT, "UTF-8");
-     
-+    //To prevent from, omiting current selected value. 
-+    if ( ! in_array($converted_curr_value, $values, TRUE)) {
-+        $values[] = $converted_curr_value;
-+    }
-+    
-     foreach ($values as $value) {       
--        
--        $select .= '<option value="' . $value . '" ';
--        if ( $value == $converted_curr_value) {
--            $select .= 'selected';
-+        $select .= '<option value="' . $value . '"';
-+        if ($value == $converted_curr_value) {
-+            $select .= ' selected ';
-         }
--        $select .= ' >' . $value. '</option>';
--    }
-+        $select .= '>' . $value. '</option>';
-+    }  
- 
-     $select_size = (sizeof($values) > 10) ? 10 : sizeof($values);
-     $select = '<select multiple="multiple" size="' . $select_size . '">'
--- 
-1.7.11.msysgit.1
-

From e3447d633522213cbc0ad2ad69e6142b1481c15f Mon Sep 17 00:00:00 2001
From: shamika <shamikadineshdha@gmail.com>
Date: Sun, 3 Mar 2013 23:40:57 +0530
Subject: [PATCH 5/5] Correct previouse error

---
 sql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql.php b/sql.php
index b563d670db..75c5e0d79c 100644
--- a/sql.php
+++ b/sql.php
@@ -224,7 +224,7 @@ if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
 	//converts characters of $_REQUEST['curr_value'] to HTML entities 
     $converted_curr_value=htmlentities($_REQUEST['curr_value'],ENT_COMPAT, "UTF-8");
 	
-	$selected_values = explode (',' , $_REQUEST['curr_value']);
+	$selected_values = explode (',' , $converted_curr_value);
     
     foreach ($values as $value) {       
         $select .= '<option value="' . $value . '"';