The branch, master has been updated via e6026f6fafb40081bb8014dd25c8102c8d97a746 (commit) via eb52f22eb013a12f25f23225a15cb29ba0825f86 (commit) from 6f1302a4dbe899754d64b421eb6baf7148c0ccb1 (commit)
- Log ----------------------------------------------------------------- commit e6026f6fafb40081bb8014dd25c8102c8d97a746 Merge: 6f1302a4dbe899754d64b421eb6baf7148c0ccb1 eb52f22eb013a12f25f23225a15cb29ba0825f86 Author: Michal Čihař mcihar@novell.com Date: Mon May 23 13:22:11 2011 +0200
Merge remote-tracking branch 'origin/QA_3_4'
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + index.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 4ad5111..63fbbea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,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 1a10103..66f6bf5 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