[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3-6479-g9fde1b5

[Madhura Jayaratne]

The branch, master has been updated
       via  9fde1b5b23c00a1c9be499122f5d46d4d9b257f3 (commit)
       via  4d1540cc1c8136040968bcfb3a4629aad2551b3a (commit)
      from  2279fd9c98ee43acba942d08c0dd3ca987748a1c (commit)


- Log -----------------------------------------------------------------
commit 9fde1b5b23c00a1c9be499122f5d46d4d9b257f3
Merge: 2279fd9c98ee43acba942d08c0dd3ca987748a1c 4d1540cc1c8136040968bcfb3a4629aad2551b3a
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Fri Jul 1 23:00:57 2011 +0530

    Merge branch 'QA_3_4'

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

Summary of changes:
 ChangeLog                        |    1 +
 js/export.js                     |   25 +++++++++++++++----------
 libraries/display_export.lib.php |    2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d9d455e..b5a0cf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,7 @@ phpMyAdmin - ChangeLog
 3.4.4.0 (not yet released)
 - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes
 - bug #3323101 [parser] Invalid escape sequence in SQL parser
+- bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option
 
 3.4.3.0 (2011-06-27)
 - bug #3311170 [sync] Missing helper icons in Synchronize
diff --git a/js/export.js b/js/export.js
index 1cf9de5..3fd3c00 100644
--- a/js/export.js
+++ b/js/export.js
@@ -89,18 +89,23 @@ $(document).ready(function() {
 /**
  * Toggles the disabling of the "save to file" options
  */
+function toggle_save_to_file() {
+    if($("#radio_dump_asfile:checked").length == 0) {
+        $("#ul_save_asfile > li").fadeTo('fast', 0.4);
+        $("#ul_save_asfile > li > input").attr('disabled', 'disabled');
+        $("#ul_save_asfile > li> select").attr('disabled', 'disabled');
+    } else {
+        $("#ul_save_asfile > li").fadeTo('fast', 1);
+        $("#ul_save_asfile > li > input").removeAttr('disabled');
+        $("#ul_save_asfile > li> select").removeAttr('disabled');
+    }
+}
+
 $(document).ready(function() {
+    toggle_save_to_file();
     $("input[type='radio'][name='output_format']").change(function() {
-        if($("#radio_dump_asfile:checked").length == 0) {
-            $("#ul_save_asfile > li").fadeTo('fast', 0.4);
-            $("#ul_save_asfile > li > input").attr('disabled', 'disabled');
-            $("#ul_save_asfile > li> select").attr('disabled', 'disabled');
-        } else {
-            $("#ul_save_asfile > li").fadeTo('fast', 1);
-            $("#ul_save_asfile > li > input").removeAttr('disabled');
-            $("#ul_save_asfile > li> select").removeAttr('disabled');
-        }
-     });
+        toggle_save_to_file();
+    });
 });
 
 /**
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 9f10d77..e47b170 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -325,7 +325,7 @@ if(isset($_GET['sql_query'])) {
                 <?php } ?>
              </ul>
         </li>
-        <li><input type="radio" id="radio_view_as_text" name="output_format" value="astext" <?php echo isset($_GET['repopulate']) ? 'checked="checked"' : '' ?>/><label for="radio_view_as_text"><?php echo __('View output as text'); ?></label></li>
+        <li><input type="radio" id="radio_view_as_text" name="output_format" value="astext" <?php echo (isset($_GET['repopulate']) || $GLOBALS['cfg']['Export']['asfile'] == false) ? 'checked="checked"' : '' ?>/><label for="radio_view_as_text"><?php echo __('View output as text'); ?></label></li>
     </ul>
  </div>
 


hooks/post-receive
-- 
phpMyAdmin