[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12974-g5e2a467

[Michal Čihař]

The branch, master has been updated
       via  5e2a467f6feb540428ea8846434334578d54fe84 (commit)
       via  1045c8f08568133d090cb8894faa56574df5afec (commit)
      from  c3f8dd92502620f368ee4f18876fae3785f9c1b8 (commit)


- Log -----------------------------------------------------------------
commit 5e2a467f6feb540428ea8846434334578d54fe84
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Aug 4 15:30:02 2011 +0200

    $GLOBALS[use_backquotes] is apparently not set anywhere

commit 1045c8f08568133d090cb8894faa56574df5afec
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Aug 4 15:28:02 2011 +0200

    Wrap export options

-----------------------------------------------------------------------

Summary of changes:
 libraries/export/latex.php |    2 +-
 libraries/export/xml.php   |   66 +++++++++++++++++++++++++++++++------------
 2 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index 1c6064a..cbf5141 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -148,7 +148,7 @@ if (isset($plugin_list)) {
     function PMA_exportDBHeader($db) {
         global $crlf;
         $head = '% ' . $crlf
-              . '% ' . __('Database') . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf
+              . '% ' . __('Database') . ': ' . '\'' . $db . '\'' . $crlf
               . '% ' . $crlf;
         return PMA_exportOutputHandler($head);
     }
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index b55d1e9..216055c 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -26,26 +26,54 @@ if (isset($plugin_list)) {
         );
 
     /* Export structure */
-    $plugin_list['xml']['options'][] =
-        array('type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options (all are recommended)'));
-    $plugin_list['xml']['options'][] =
-        array('type' => 'bool', 'name' => 'export_functions', 'text' => __('Functions'));
-    $plugin_list['xml']['options'][] =
-        array('type' => 'bool', 'name' => 'export_procedures', 'text' => __('Procedures'));
-    $plugin_list['xml']['options'][] =
-        array('type' => 'bool', 'name' => 'export_tables', 'text' => __('Tables'));
-    $plugin_list['xml']['options'][] =
-        array('type' => 'bool', 'name' => 'export_triggers', 'text' => __('Triggers'));
-    $plugin_list['xml']['options'][] =
-        array('type' => 'bool', 'name' => 'export_views', 'text' => __('Views'));
-    $plugin_list['xml']['options'][] = array('type' => 'end_group');
+    $plugin_list['xml']['options'][] = array(
+        'type' => 'begin_group',
+        'name' => 'structure',
+        'text' => __('Object creation options (all are recommended)')
+        );
+    $plugin_list['xml']['options'][] = array(
+        'type' => 'bool',
+        'name' => 'export_functions',
+        'text' => __('Functions')
+        );
+    $plugin_list['xml']['options'][] = array(
+        'type' => 'bool',
+        'name' => 'export_procedures',
+        'text' => __('Procedures')
+        );
+    $plugin_list['xml']['options'][] = array(
+        'type' => 'bool',
+        'name' => 'export_tables',
+        'text' => __('Tables')
+        );
+    $plugin_list['xml']['options'][] = array(
+        'type' => 'bool',
+        'name' => 'export_triggers',
+        'text' => __('Triggers')
+        );
+    $plugin_list['xml']['options'][] = array(
+        'type' => 'bool',
+        'name' => 'export_views',
+        'text' => __('Views')
+        );
+    $plugin_list['xml']['options'][] = array(
+        'type' => 'end_group'
+        );
 
     /* Data */
-    $plugin_list['xml']['options'][] =
-        array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options'));
-    $plugin_list['xml']['options'][] =
-        array('type' => 'bool', 'name' => 'export_contents', 'text' => __('Export contents'));
-    $plugin_list['xml']['options'][] = array('type' => 'end_group');
+    $plugin_list['xml']['options'][] = array(
+        'type' => 'begin_group',
+        'name' => 'data',
+        'text' => __('Data dump options')
+        );
+    $plugin_list['xml']['options'][] = array(
+        'type' => 'bool',
+        'name' => 'export_contents',
+        'text' => __('Export contents')
+        );
+    $plugin_list['xml']['options'][] = array(
+        'type' => 'end_group'
+        );
 } else {
 
     /**
@@ -243,7 +271,7 @@ if (isset($plugin_list)) {
 
         if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
             $head = '    <!--' . $crlf
-                  . '    - ' . __('Database') . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf
+                  . '    - ' . __('Database') . ': ' .  '\'' . $db . '\'' . $crlf
                   . '    -->' . $crlf
                   . '    <database name="' . htmlspecialchars($db) . '">' . $crlf;
 


hooks/post-receive
-- 
phpMyAdmin