From c2c260b79e7a87e778961a684120781a680812df Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 19 Apr 2009 12:24:45 +0000
Subject: [PATCH] patch #2739001 [export] XML does not allow spaces in element
 names

---
 ChangeLog                | 2 ++
 libraries/export/xml.php | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index df90beae6d..350a888f54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   thanks to Tomas Srnka - tomassrnka
 
 3.1.5.0 (not yet released)
+- patch #2739001 [export] XML does not allow spaces in element names, 
+  thanks to Derek Schaefer - drummingds1
 
 3.1.4.0 (not yet released)
 + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index e903afa019..77d75ad192 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -96,6 +96,7 @@ function PMA_exportHeader() {
  */
 function PMA_exportDBHeader($db) {
     global $crlf;
+    $db = str_replace(' ', '_', $db);
     $head = '<!--' . $crlf
           . '- ' . $GLOBALS['strDatabase'] . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf
           . '-->' . $crlf
@@ -114,6 +115,7 @@ function PMA_exportDBHeader($db) {
  */
 function PMA_exportDBFooter($db) {
     global $crlf;
+    $db = str_replace(' ', '_', $db);
     return PMA_exportOutputHandler('</' . $db . '>' . $crlf);
 }
 
@@ -145,11 +147,13 @@ function PMA_exportDBCreate($db) {
  * @access  public
  */
 function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+    $db = str_replace(' ', '_', $db);
+    $table = str_replace(' ', '_', $table);
     $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
 
     $columns_cnt = PMA_DBI_num_fields($result);
     for ($i = 0; $i < $columns_cnt; $i++) {
-        $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i));
+        $columns[$i] = stripslashes(str_replace(' ', '_', PMA_DBI_field_name($result, $i)));
     }
     unset($i);
 
-- 
2.11.4.GIT