From a8caf74fdafdce6b65a411635593f2347ae984ae Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 20 Jun 2011 12:18:57 -0400
Subject: [PATCH 1/2] 3.4.3-rc1

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

diff --git a/Documentation.html b/Documentation.html
index 6146f216b..fb2a8819f 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
     <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=utf-8" />
-    <title>phpMyAdmin 3.4.3-dev - Documentation</title>
+    <title>phpMyAdmin 3.4.3-rc1 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.4.3-dev
+        3.4.3-rc1
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index d3da4f92f..53a08eb4b 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.4.3-dev
+Version 3.4.3-rc1
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index d426b5338..7081f8394 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -96,7 +96,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.4.3-dev');
+        $this->set('PMA_VERSION', '3.4.3-rc1');
         /**
          * @deprecated
          */

From cb043f4365be9b8edec63188d339eda2154401fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 21 Jun 2011 12:04:52 +0200
Subject: [PATCH 2/2] Use standard infrastructure for generating links, this
 also prevents XSS

---
 enum_editor.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/enum_editor.php b/enum_editor.php
index 586e85e7f..ab86d737c 100644
--- a/enum_editor.php
+++ b/enum_editor.php
@@ -53,11 +53,11 @@ require_once './libraries/header_meta_style.inc.php';
             ?>
             </div>
             <p>
-               <a href="enum_editor.php?token=<?php echo urlencode($_GET['token']); ?>&field=<?php echo urlencode($_GET['field']); ?>&extra_fields=<?php echo $_GET['extra_fields'] + 1; ?>&values=<?php echo urlencode(join(",", $values)); ?>">
+               <a href="enum_editor.php<?php echo PMA_generate_common_url(array('field' => $_GET['field'], 'extra_fields' => $_GET['extra_fields'] + 1, 'values' => join(',', $values))); ?>">
 <?php echo __('+ Restart insertion and add a new value'); ?>
                </a>
             </p>
-             <input type="hidden" name="token" value="<?php echo htmlspecialchars($_GET['token']); ?>" />
+            <?php echo PMA_generate_common_hidden_inputs(); ?>
              <input type="hidden" name="field" value="<?php echo htmlspecialchars($_GET['field']); ?>" />
              <input type="hidden" name="num_fields" value="<?php echo $total_fields; ?>" />
              <input type="submit" value="<?php echo __('Go'); ?>" />