From 2189c875356fc1af21c6da32235bf24f60f53b96 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 24 May 2013 12:40:01 -0400
Subject: [PATCH 1/2] 4.0.2 release

---
 ChangeLog                  | 2 +-
 README                     | 2 +-
 doc/conf.py                | 2 +-
 libraries/Config.class.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7a0d9a7aec..7f8171a27d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.0.2.0 (not yet released)
+4.0.2.0 (2013-05-24)
 - bug #3902 Cannot browse when table name contains keyword "call"
 + center loading indicator for navigation refresh, related to bug #3920
 - bug #3925 Table sorting in navigation panel is case-sensitive
diff --git a/README b/README
index 88d2d4647d..2db85164a2 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.0.2-rc1
+Version 4.0.2
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/doc/conf.py b/doc/conf.py
index a76fac0906..0dab0c4511 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -49,7 +49,7 @@ copyright = u'2012 - 2013, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.2-rc1'
+version = '4.0.2'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index ae3034df2f..0fa39e0958 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -101,7 +101,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.0.2-rc1');
+        $this->set('PMA_VERSION', '4.0.2');
         /**
          * @deprecated
          */

From 9b3551601ce714adb5e3f428476052f0ec6093bf Mon Sep 17 00:00:00 2001
From: Dieter Adriaenssens <ruleant@users.sourceforge.net>
Date: Wed, 29 May 2013 21:13:32 +0200
Subject: [PATCH 2/2] escape query in error message

---
 view_create.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/view_create.php b/view_create.php
index d8781295d8..cd2ec3b616 100644
--- a/view_create.php
+++ b/view_create.php
@@ -114,7 +114,8 @@ if (isset($_REQUEST['createview'])) {
             $response->addJSON(
                 'message',
                 PMA_Message::error(
-                    "<i>$sql_query</i><br /><br />" . PMA_DBI_getError()
+                    "<i>" . htmlspecialchars($sql_query) . "</i><br /><br />"
+                    . PMA_DBI_getError()
                 )
             );
             $response->isSuccess(false);