From c06c96f317911f73d7362812ff3465bc7934f109 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 21 Dec 2006 01:22:03 +0000
Subject: [PATCH] patch #1611684 part 2, other issues with the caching of
 phpmyadmin.css.php

---
 ChangeLog                          | 3 +++
 browse_foreigners.php              | 2 +-
 libraries/header_printview.inc.php | 2 +-
 navigation.php                     | 2 +-
 test/theme.php                     | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 28b94e2f4..5ef00efe4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@ $HeadURL$
 2006-12-20 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/export/sql.php: bug #1619647, export of query results
       should not contain procedure definitions
+    * navigation.php, test/theme.php,  browse_foreigners.php,
+      libraries/header_printview.inc.php: patch #1611684 part 2, client 
+      caching of phpmyadmin.css.php, thanks to Christian Schmidt
 
 2006-12-19 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * tbl_change.php, tbl_replace.php, include/tbl_replace_fields.inc.php:
diff --git a/browse_foreigners.php b/browse_foreigners.php
index ba995c0a6..aae0a740e 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -93,7 +93,7 @@ if (isset($disp_row) && is_array($disp_row)) {
     <title>phpMyAdmin</title>
     <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
     <link rel="stylesheet" type="text/css"
-        href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url( '', '' ); ?>&amp;js_frame=right" />
+        href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url( '', '' ); ?>&amp;js_frame=right&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
     <script src="./js/functions.js" type="text/javascript" language="javascript"></script>
     <script type="text/javascript" language="javascript">
     //<![CDATA[
diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php
index 82c8c5261..915c2b76d 100644
--- a/libraries/header_printview.inc.php
+++ b/libraries/header_printview.inc.php
@@ -46,7 +46,7 @@ if ($text_dir == 'ltr') {
 <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
 <title><?php echo $strSQLResult; ?> - phpMyAdmin <?php echo PMA_VERSION ?></title>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
-<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url( '', '' ); ?>&amp;js_frame=print" />
+<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url( '', '' ); ?>&amp;js_frame=print&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
 </style>
 </head>
 
diff --git a/navigation.php b/navigation.php
index 5d3692fcb..bf9a1b46b 100644
--- a/navigation.php
+++ b/navigation.php
@@ -130,7 +130,7 @@ require_once './libraries/header_http.inc.php';
         content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
     <base target="frame_content" />
     <link rel="stylesheet" type="text/css"
-        href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=left" />
+        href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=left&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
     <script type="text/javascript" src="js/navigation.js"></script>
     <script type="text/javascript">
     // <![CDATA[
diff --git a/test/theme.php b/test/theme.php
index 887d3813a..4cc85a3dc 100644
--- a/test/theme.php
+++ b/test/theme.php
@@ -31,7 +31,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
     <meta http-equiv="Content-Type"
         content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
     <link rel="stylesheet" type="text/css"
-        href="../css/phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=right" />
+        href="../css/phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=right&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
     <link rel="stylesheet" type="text/css" media="print"
         href="../css/print.css?<?php echo PMA_generate_common_url(); ?>" />
     <script src="../js/functions.js" type="text/javascript"