[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-36-geb52f22

Mon May 23 13:21:35 CEST 2011

The branch, QA_3_4 has been updated
       via  eb52f22eb013a12f25f23225a15cb29ba0825f86 (commit)
      from  548b62e93f2281805aff12f286e4df011c8791c4 (commit)


- Log -----------------------------------------------------------------
commit eb52f22eb013a12f25f23225a15cb29ba0825f86
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon May 23 13:19:43 2011 +0200

    bug #3276001 [core] Avoid caching of index.php.

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

Summary of changes:
 ChangeLog |    1 +
 index.php |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0bed539..07a810a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 - bug #3305517 [config] Config for export compression not used
 - bug #3305883 [interface] Table is dropped regardless of confirmation
 - [auth] Fixed error handling for signon auth method.
+- bug #3276001 [core] Avoid caching of index.php.
 
 3.4.1.0 (2011-05-20)
 - bug #3301108 [interface] Synchronize and already configured host
diff --git a/index.php b/index.php
index 5d19758..5f78320 100644
--- a/index.php
+++ b/index.php
@@ -89,7 +89,7 @@ $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][1];
 
 
 // start output
-header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
+include ('./libraries/header_http.inc.php');
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">


hooks/post-receive
-- 
phpMyAdmin


