nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix export of SQL for Safari (bug #1113015).

Browse Source
This commit is contained in:
Michal Čihař
2005-02-08 15:12:47 +00:00
parent 1df092f4d7
commit f07464e5c3
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -5,10 +5,13 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-02-08 Michal Čihař <michal@cihar.com>
* export.php: Fix export of SQL for Safari (bug #1113015).
2005-02-07 Marc Delisle <lem9@users.sourceforge.net> 2005-02-07 Marc Delisle <lem9@users.sourceforge.net>
* libraries/dbi/*: bug #1116933, PMA_DBI_free_result(): * libraries/dbi/*: bug #1116933, PMA_DBI_free_result():
do not send a boolean to mysqli_free_result() or mysql_free_result(), do not send a boolean to mysqli_free_result() or mysql_free_result(),
it expects a result resource it expects a result resource
* libraries/tbl_move_copy.php: bug #1117112, commands out of sync when * libraries/tbl_move_copy.php: bug #1117112, commands out of sync when
using "copy table" operation using "copy table" operation
* libraries/common.lib.php: bug #1114363, error when SHOW DATABASES is * libraries/common.lib.php: bug #1114363, error when SHOW DATABASES is
@@ -34,8 +37,8 @@ $Source$
2005-02-02 Marc Delisle <lem9@users.sourceforge.net> 2005-02-02 Marc Delisle <lem9@users.sourceforge.net>
* libraries/dbi/*: PMA_DBI_num_rows(): do not send a boolean * libraries/dbi/*: PMA_DBI_num_rows(): do not send a boolean
to mysqli_num_rows() or mysql_num_row(), it expects a result resource to mysqli_num_rows() or mysql_num_row(), it expects a result resource
* tbl_properties.inc.php: bug #1114550, changing the type of * tbl_properties.inc.php: bug #1114550, changing the type of
a float unsigned column a float unsigned column
2005-01-30 Marc Delisle <lem9@users.sourceforge.net> 2005-01-30 Marc Delisle <lem9@users.sourceforge.net>

7
export.php
View File

@@ -230,7 +230,12 @@ if ($asfile) {
$mime_type = 'application/x-tex'; $mime_type = 'application/x-tex';
} else { } else {
$filename .= '.sql'; $filename .= '.sql';
$mime_type = 'text/x-sql'; // text/x-sql is correct MIME type, however safari ignores further
// Content-Disposition header, so we must force it to download it this
// way...
$mime_type = PMA_USR_BROWSER_AGENT == 'SAFARI'
? 'application/octet-stream'
: 'text/x-sql';
} }
// If dump is going to be compressed, set correct encoding or mime_type and add // If dump is going to be compressed, set correct encoding or mime_type and add