Fixed OpenDocument exports

Fixes #13002 Signed-off-by: Michal Čihař <michal@cihar.com>
phpmyadmin · Feb 20, 2017 · 59e9856 · 59e9856
1 parent 4591c24
commit 59e9856
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -80,6 +80,7 @@ phpMyAdmin - ChangeLog
 - issue #13016 and #13017 Slight improvements to the table layout of Relation view
 - issue #12345 Correctly show affected rows for LOAD DATA queries
 - issue #13010 Copy database: SQL error for copying PMADB metadata
+- issue #13002 Fixed OpenDocument exports
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

diff --git a/libraries/OpenDocument.php b/libraries/OpenDocument.php
@@ -61,7 +61,7 @@ public static function create($mime, $data)
         $zipfile -> addFile(
             '<?xml version="1.0" encoding="UTF-8"?' . '>'
             . '<office:document-styles ' . OpenDocument::NS
-            . 'office:version="1.0">'
+            . ' office:version="1.0">'
             . '<office:font-face-decls>'
             . '<style:font-face style:name="Arial Unicode MS"'
             . ' svg:font-family="\'Arial Unicode MS\'" style:font-pitch="variable"/>'

diff --git a/libraries/plugins/export/ExportOds.php b/libraries/plugins/export/ExportOds.php
@@ -91,7 +91,7 @@ public function exportHeader()
     {
         $GLOBALS['ods_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>'
             . '<office:document-content '
-            . OpenDocument::NS . 'office:version="1.0">'
+            . OpenDocument::NS . ' office:version="1.0">'
             . '<office:automatic-styles>'
             . '<number:date-style style:name="N37"'
             . ' number:automatic-order="true">'

diff --git a/libraries/plugins/export/ExportOdt.php b/libraries/plugins/export/ExportOdt.php
@@ -148,7 +148,7 @@ public function exportHeader()
     {
         $GLOBALS['odt_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>'
             . '<office:document-content '
-            . OpenDocument::NS . 'office:version="1.0">'
+            . OpenDocument::NS . ' office:version="1.0">'
             . '<office:body>'
             . '<office:text>';