From 8e18c2d8df6c4185df8765ed216ef4a452686575 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 24 Mar 2009 21:04:18 +0000
Subject: [PATCH] 2.11.9.5

---
 ChangeLog                  | 4 ++++
 Documentation.html         | 4 ++--
 README                     | 2 +-
 libraries/Config.class.php | 2 +-
 translators.html           | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2e7ce4487b..331ed94d50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
+2.11.9.5 (2009-03-24)
+- [security] XSS vulnerability on export page
+- [security] Insufficient output sanitizing when generating configuration file
+
 2.11.9.4 (2008-12-09)
 - [security] possible XSRF on several pages
 
diff --git a/Documentation.html b/Documentation.html
index 0a8fc02a4b..a00a16cee0 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -11,7 +11,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-    <title>phpMyAdmin 2.11.9.4 - Documentation</title>
+    <title>phpMyAdmin 2.11.9.5 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -33,7 +33,7 @@
     <li><a href="#glossary">Glossary</a></li>
 </ul>
 
-<h1>phpMyAdmin 2.11.9.4 Documentation</h1>
+<h1>phpMyAdmin 2.11.9.5 Documentation</h1>
 
 <ul><li><a href="http://www.phpmyadmin.net/">
             phpMyAdmin homepage</a></li>
diff --git a/README b/README
index 3258d5c67a..124d4cb58b 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ phpMyAdmin - Readme
 
   A set of PHP-scripts to manage MySQL over the web.
 
-  Version 2.11.9.4
+  Version 2.11.9.5
   ----------------
   http://www.phpmyadmin.net/
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 2abc0cc3b2..2e460a6dc7 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -85,7 +85,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '2.11.9.4');
+        $this->set('PMA_VERSION', '2.11.9.5');
         /**
          * @deprecated
          */
diff --git a/translators.html b/translators.html
index a8c496a80a..f74054501c 100644
--- a/translators.html
+++ b/translators.html
@@ -8,7 +8,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-    <title>phpMyAdmin 2.11.9.4 - Official translators</title>
+    <title>phpMyAdmin 2.11.9.5 - Official translators</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -31,7 +31,7 @@
     <li><a href="Documentation.html#glossary">Glossary</a></li>
 </ul>
 
-<h1>phpMyAdmin 2.11.9.4 official translators list</h1>
+<h1>phpMyAdmin 2.11.9.5 official translators list</h1>
 
 <p> Here is the list of the &quot;official translators&quot; of
     phpMyAdmin.</p>
-- 
2.11.4.GIT