diff --git a/ChangeLog b/ChangeLog index 610f1449f..507cadfeb 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $Source$ 2005-11-15 Michal Čihař * css/phpmyadmin.css.php: Do not use common header file, as there is nothing common at all. + * libraries/header_http.inc.php: Allways send text/html content type. 2005-11-14 Michal Čihař * libraries/sql_query_form.lib.php: Fix %f expansion (bug #1355776). diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php index ba8584d47..d3b3e869a 100644 --- a/libraries/header_http.inc.php +++ b/libraries/header_http.inc.php @@ -5,19 +5,13 @@ /** * Sends http headers */ -// Don't use cache (required for Opera) -$ctype = (isset($ctype) ? $ctype : 'html'); -if ($ctype == 'css') { - header('Content-Type: text/css; charset=ISO-8859-1'); -} else { - $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT'; - header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21 - header('Last-Modified: ' . $GLOBALS['now']); - header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1 - header('Pragma: no-cache'); // HTTP/1.0 - if (!isset($is_transformation_wrapper)) { - // Define the charset to be used - header('Content-Type: text/' . $ctype . '; charset=' . $GLOBALS['charset']); - } +$GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT'; +header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21 +header('Last-Modified: ' . $GLOBALS['now']); +header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1 +header('Pragma: no-cache'); // HTTP/1.0 +if (!isset($is_transformation_wrapper)) { + // Define the charset to be used + header('Content-Type: text/html; charset=' . $GLOBALS['charset']); } ?>