[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8915-g4c6310e

Piotr Przybylski crackpl at users.sourceforge.net
Sun Aug 29 02:18:27 CEST 2010


The branch, master has been updated
       via  4c6310e349f249c927ceaac8f3a862895a2a4f83 (commit)
      from  06f472ed51fb260d6c9baa0730662197098e217c (commit)


- Log -----------------------------------------------------------------
commit 4c6310e349f249c927ceaac8f3a862895a2a4f83
Author: Crack <piotrprz at gmail.com>
Date:   Sun Aug 29 02:18:04 2010 +0200

    add Export/quick_export_onserver and Export/quick_export_onserver_overwrite to user preferences

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

Summary of changes:
 libraries/config/messages.inc.php           |    2 ++
 libraries/config/setup.forms.php            |   17 ++++++++++++-----
 libraries/config/user_preferences.forms.php |   15 ++++++++++++---
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index cf39b23..a771ee6 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -111,6 +111,8 @@ $strConfigExport_odt_relation_name = __('Relations');
 $strConfigExport_odt_structure_or_data_name = __('Dump table');
 $strConfigExport_onserver_name = __('Save on server');
 $strConfigExport_onserver_overwrite_name = __('Overwrite existing file(s)');
+$strConfigExport_quick_export_onserver_name = __('Save on server');
+$strConfigExport_quick_export_onserver_overwrite_name = __('Overwrite existing file(s)');
 $strConfigExport_remember_file_template_name = __('Remember file name template');
 $strConfigExport_sql_auto_increment_name = __('Add AUTO_INCREMENT value');
 $strConfigExport_sql_backquotes_name = __('Enclose table and column names with backquotes');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index af8d284..8979e27 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -256,14 +256,21 @@ $forms['Import']['Open_Document'] = array('Import' => array(
         'ods_recognize_percentages',
         'ods_recognize_currency'));
 $forms['Export']['Export_defaults'] = array('Export' => array(
-    'method',
+    'method' => ':group',
+        ':group:' . __('Quick'),
+            'quick_export_onserver',
+            'quick_export_onserver_overwrite',
+            ':group:end',
+        ':group:' . __('Custom'),
+            'asfile' => ':group',
+                'onserver',
+                'onserver_overwrite',
+                ':group:end',
+            ':group:end',
+        ':group:end',
     'format',
     'compression',
     'charset',
-    'asfile' => ':group',
-    'onserver',
-    'onserver_overwrite',
-    ':group:end',
     'remember_file_template',
     'file_template_table',
     'file_template_database',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 564f093..bd3202f 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -159,12 +159,21 @@ $forms['Import']['Open_Document'] = array(
         'Import/ods_recognize_percentages',
         'Import/ods_recognize_currency');
 $forms['Export']['Export_defaults'] = array(
-    'Export/method',
+    'Export/method' => ':group',
+        ':group:' . __('Quick'),
+            'Export/quick_export_onserver',
+            'Export/quick_export_onserver_overwrite',
+            ':group:end',
+        ':group:' . __('Custom'),
+            'Export/asfile' => ':group',
+                'Export/onserver',
+                'Export/onserver_overwrite',
+                ':group:end',
+            ':group:end',
+        ':group:end',
     'Export/format',
     'Export/compression',
     'Export/charset',
-    'Export/asfile',
-    'Export/remember_file_template',
     'Export/file_template_table',
     'Export/file_template_database',
     'Export/file_template_server');


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list