From 87fad589653478875ba6f86a5c5ceec805d0f8b2 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Tue, 8 Feb 2011 07:57:34 -0500
Subject: [PATCH 1/2] PMASA-2011-1 fixes

---
 changelog.php | 10 +++++++++-
 license.php   | 11 ++++++++++-
 readme.php    | 10 +++++++++-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/changelog.php b/changelog.php
index 2b0dc3ae0..1b4807aa4 100644
--- a/changelog.php
+++ b/changelog.php
@@ -6,7 +6,15 @@
  * @version $Id$
  */
 
-$changelog = htmlspecialchars(file_get_contents('ChangeLog'));
+$filename = 'ChangeLog';
+
+// Check if the file is available, some distributions remove these.
+if (is_readable($filename)) {
+    $changelog = htmlspecialchars(file_get_contents($filename));
+} else {
+    echo "The $filename file is not available on this system, please visit www.phpmyadmin.net for more information.";
+    exit;
+}
 
 $replaces = array(
     '@(http://[./a-zA-Z0-9.-]*[/a-zA-Z0-9])@'
diff --git a/license.php b/license.php
index 91927f41a..c8c295799 100644
--- a/license.php
+++ b/license.php
@@ -13,5 +13,14 @@
  *
  */
 header('Content-type: text/plain; charset=iso-8859-1');
-readfile('LICENSE');
+
+$filename = 'LICENSE';
+
+// Check if the file is available, some distributions remove these.
+if (is_readable($filename)) {
+    readfile($filename);
+} else {
+    echo "The $filename file is not available on this system, please visit www.phpmyadmin.net for more information.";
+}
+
 ?>
diff --git a/readme.php b/readme.php
index 34fecce0e..7f59a4e2f 100644
--- a/readme.php
+++ b/readme.php
@@ -13,5 +13,13 @@
  *
  */
 header('Content-type: text/plain; charset=utf-8');
-readfile('README');
+
+$filename = 'README';
+
+// Check if the file is available, some distributions remove these.
+if (is_readable($filename)) {
+    readfile($filename);
+} else {
+    echo "The $filename file is not available on this system, please visit www.phpmyadmin.net for more information.";
+}
 ?>

From 448940b37b55648248d9a62139b8838feece3931 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 8 Feb 2011 08:07:22 -0500
Subject: [PATCH 2/2] 2.11.11.2 release

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

diff --git a/ChangeLog b/ChangeLog
index 89fe37c4b..06a61e219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
+2.11.11.2 (2011-02-08)
+- [security] Path disclosure, see PMASA-2011-1
+
 2.11.11.1 (2010-11-29)
 - bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8
 
diff --git a/Documentation.html b/Documentation.html
index a3f798278..6fadc33be 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.11.1 - Documentation</title>
+    <title>phpMyAdmin 2.11.11.2 - 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.11.1 Documentation</h1>
+<h1>phpMyAdmin 2.11.11.2 Documentation</h1>
 
 <ul><li><a href="http://www.phpmyadmin.net/">
             phpMyAdmin homepage</a></li>
diff --git a/README b/README
index a1dfb541c..9a1d370ab 100644
--- a/README
+++ b/README
@@ -5,12 +5,12 @@ phpMyAdmin - Readme
 
   A set of PHP-scripts to manage MySQL over the web.
 
-  Version 2.11.11.1
+  Version 2.11.11.2
   -----------------
   http://www.phpmyadmin.net/
 
     Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
-    Copyright (C) 2001-2010 Marc Delisle <Marc.Delisle_at_cegepsherbrooke.qc.ca>
+    Copyright (C) 2001-2011 Marc Delisle <marc_at_infomarc.info>
                             Olivier Müller <om_at_omnis.ch>
                             Robin Johnson <robbat2_at_users.sourceforge.net>
                             Alexander M. Turek <me_at_derrabus.de>
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index f1df2e09d..755230f45 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.11.1');
+        $this->set('PMA_VERSION', '2.11.11.2');
         /**
          * @deprecated
          */
diff --git a/translators.html b/translators.html
index f59ca4180..27ac0f701 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.11.1 - Official translators</title>
+    <title>phpMyAdmin 2.11.11.2 - 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.11.1 official translators list</h1>
+<h1>phpMyAdmin 2.11.11.2 official translators list</h1>
 
 <p> Here is the list of the &quot;official translators&quot; of
     phpMyAdmin.</p>