Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0

ChangeLog

@@ -3,7 +3,8 @@ phpMyAdmin - ChangeLog
 
 4.0.7.0 (not yet released)
 - bug #3993 Sorting in database overview with statistics doesn't work
-- bug Handle the situation where PHP_SELF is not set 
+- bug Handle the situation where PHP_SELF is not set
+- bug #4080 Overwrite existing file not obeyed
 
 4.0.6.0 (2013-09-05)
 - bug #4036 Call to undefined function mb_detect_encoding (clarify the doc)

export.php

@@ -502,7 +502,7 @@ if ($save_on_server) {
         . preg_replace('@[/\\\\]@', '_', $filename);
     unset($message);
     if (file_exists($save_filename)
-        && ((! $quick_export && empty($onserverover))
+        && ((! $quick_export && empty($_REQUEST['onserverover']))
         || ($quick_export
         && $_REQUEST['quick_export_onserverover'] != 'saveitover'))
     ) {