Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

libraries/import.lib.php

@@ -135,8 +135,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false,
                 && ! $error
                 && ((! empty($import_run_buffer['sql'])
                 && preg_match($pattern, $import_run_buffer['sql']))
-                || ($executed_queries == 1
-                && ! isset($_REQUEST['fk_checks'])))
+                || ($executed_queries == 1))
             ) {
                 $go_sql = true;
                 if (! $sql_query_disabled) {

libraries/sql.lib.php

@@ -2086,6 +2086,9 @@ function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results,
 
     include_once 'libraries/DisplayResults.class.php';
 
+    // Handle disable/enable foreign key checks
+    $default_fk_check = PMA_Util::handleDisableFKCheckInit();
+
     // Handle remembered sorting order, only for single table query
     // Handling is not required when it's a union query
     // (the parser never sets the 'union' key to 0)
@@ -2163,6 +2166,9 @@ function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results,
         );
     }
 
+    // Handle disable/enable foreign key checks
+    PMA_Util::handleDisableFKCheckCleanup($default_fk_check);
+
     return $html_output;
 }
 

scripts/upload-release

@@ -15,6 +15,7 @@ if [ $# -gt 2 ] ; then
     cd "$3"
 fi
 
+# Upload to sourceforge
 sftp $USER,phpmyadmin@frs.sourceforge.net <<EOT
 cd /home/frs/project/p/ph/phpmyadmin/phpMyAdmin
 mkdir $REL
@@ -31,3 +32,24 @@ put phpMyAdmin-$REL-all-languages.7z
 put phpMyAdmin-$REL-english.7z
 put phpMyAdmin-$REL-notes.html
 EOT
+
+# Upload to our file server
+sftp -P 10022 files@klutz.phpmyadmin.net <<EOT
+cd /mnt/storage/files/phpMyAdmin
+mkdir $REL
+cd $REL
+put phpMyAdmin-$REL-all-languages.tar.bz2
+put phpMyAdmin-$REL-english.tar.bz2
+put phpMyAdmin-$REL-all-languages.tar.xz
+put phpMyAdmin-$REL-english.tar.xz
+put phpMyAdmin-$REL-all-languages.tar.gz
+put phpMyAdmin-$REL-english.tar.gz
+put phpMyAdmin-$REL-all-languages.zip	
+put phpMyAdmin-$REL-english.zip
+put phpMyAdmin-$REL-all-languages.7z	
+put phpMyAdmin-$REL-english.7z
+put phpMyAdmin-$REL-notes.html
+EOT
+
+# Sync files to CDN
+ssh -p 10022 files@klutz.phpmyadmin.net ./bin/sync-files-cdn