From 3db816c6ecfd03cfe9bf133aec2952f9ab284052 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 17 Mar 2012 11:12:31 -0400
Subject: [PATCH 1/3] 3.5.0-rc2 release

---
 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 c6bd42dec3..877049f28f 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.5.0-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.5.0-rc2 - 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.5.0-rc1
+        3.5.0-rc2
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index ebdcaf7559..5c75273f52 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.5.0-rc1
+Version 3.5.0-rc2
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 7f25ab67ee..1872db1ada 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -98,7 +98,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.5.0-rc1');
+        $this->set('PMA_VERSION', '3.5.0-rc2');
         /**
          * @deprecated
          */

From 04f14a43f513e6df687c9650ba8afc87b45376df Mon Sep 17 00:00:00 2001
From: Rouslan Placella <rouslan@placella.com>
Date: Sun, 18 Mar 2012 23:36:04 +0000
Subject: [PATCH 2/3] PMA_confirm() code clean-up

---
 js/functions.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index b33507819e..9a63b88606 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1903,17 +1903,24 @@ jQuery.fn.PMA_confirm = function(question, url, callbackFn) {
      */
     var button_options = {};
     button_options[PMA_messages['strOK']] = function(){
-                                                $(this).dialog("close").remove();
+        $(this).dialog("close");
 
-                                                if($.isFunction(callbackFn)) {
-                                                    callbackFn.call(this, url);
-                                                }
-                                            };
-    button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();}
+        if($.isFunction(callbackFn)) {
+            callbackFn.call(this, url);
+        }
+    };
+    button_options[PMA_messages['strCancel']] = function() {
+        $(this).dialog("close");
+    }
 
-    $('<div id="confirm_dialog"></div>')
+    $('<div/>', {'id':'confirm_dialog'})
     .prepend(question)
-    .dialog({buttons: button_options});
+    .dialog({
+        buttons: button_options,
+        close: function () {
+            $(this).remove();
+        }
+    });
 };
 
 /**

From eabe39881178a827786dfbff4a95c817c60f6288 Mon Sep 17 00:00:00 2001
From: Rouslan Placella <rouslan@placella.com>
Date: Sun, 18 Mar 2012 23:36:35 +0000
Subject: [PATCH 3/3] Dialogs generated by PMA_confirm() should be modal

---
 js/functions.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/functions.js b/js/functions.js
index 9a63b88606..0f2e7da1df 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1919,7 +1919,8 @@ jQuery.fn.PMA_confirm = function(question, url, callbackFn) {
         buttons: button_options,
         close: function () {
             $(this).remove();
-        }
+        },
+        modal: true
     });
 };