Allow to export JSON with unescaped unicode chars

This is optional as there are some parsers which have problems with utf-8, see http://stackoverflow.com/q/4901133/225718 Fixes #12946 Signed-off-by: Michal Čihař <michal@cihar.com>
phpmyadmin · Feb 2, 2017 · c0bb952 · c0bb952
1 parent 8c102dc
commit c0bb952
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
 ======================
 
 4.8.0 (not yet released)
+- issue #12946 Allow to export JSON with unescaped unicode chars
 
 4.7.0.0 (not yet released)
 - patch #12233 [Display] Improve message when renaming database to same name

diff --git a/export.php b/export.php
@@ -95,6 +95,7 @@
         'ods_columns',
         'json_structure_or_data',
         'json_pretty_print',
+        'json_unicode',
         'xml_structure_or_data',
         'xml_export_events',
         'xml_export_functions',

diff --git a/libraries/config.default.php b/libraries/config.default.php
@@ -1855,6 +1855,13 @@
  */
 $cfg['Export']['json_pretty_print'] = false;
 
+/**
+ * Export functions
+ *
+ * @global string $cfg['Export']['json_unicode']
+ */
+$cfg['Export']['json_unicode'] = true;
+
 /**
  *
  *

diff --git a/libraries/plugins/export/ExportJson.php b/libraries/plugins/export/ExportJson.php
@@ -43,13 +43,18 @@ public function __construct()
      */
     public function encode($data)
     {
+        $options = 0;
         if (isset($GLOBALS['json_pretty_print'])
             && $GLOBALS['json_pretty_print']
         ) {
-            return json_encode($data, JSON_PRETTY_PRINT);
-        } else {
-            return json_encode($data);
+            $options |= JSON_PRETTY_PRINT;
+        }
+        if (isset($GLOBALS['json_unicode'])
+            && $GLOBALS['json_unicode']
+        ) {
+            $options |= JSON_UNESCAPED_UNICODE;
         }
+        return json_encode($data, $options);
     }
 
     /**
@@ -84,6 +89,12 @@ protected function setProperties()
         );
         $generalOptions->addProperty($leaf);
 
+        $leaf = new BoolPropertyItem(
+            'unicode',
+            __('Output unicode characters unescaped')
+        );
+        $generalOptions->addProperty($leaf);
+
         // add the main group to the root group
         $exportSpecificOptions->addProperty($generalOptions);