[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_9-12-gdf97b1d

[Michal Čihař]

The branch, QA_3_3 has been updated
       via  df97b1d2c075a0db4241b8494e36fa85eb231dcf (commit)
      from  31cd4bdd6a7c42527b2011201d378e3c9accce8a (commit)


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 libraries/export/yaml.php |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php
index d1ba38e..946962c 100644
--- a/libraries/export/yaml.php
+++ b/libraries/export/yaml.php
@@ -167,11 +167,8 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
                 continue;
             }
 
-            $record[$i] = preg_replace('/\r\n|\r|\n/', $crlf.'    ', $record[$i]);
-            if (strstr($record[$i], $crlf))
-              $record[$i] = '|-' . $crlf . '    '.$record[$i];
-
-            $buffer .= '  ' . $column . ': ' . $record[$i] . $crlf;
+            $record[$i] = str_replace(array('\\', '"', "\n", "\r"), array('\\\\', '\"', '\n', '\r'), $record[$i]);
+            $buffer .= '  ' . $column . ': "' . $record[$i] . '"' . $crlf;
         }
 
         if (! PMA_exportOutputHandler($buffer)) {


hooks/post-receive
-- 
phpMyAdmin