From 5a5bd3e5354a16669be9c79b45df2d0985727c87 Mon Sep 17 00:00:00 2001
From: Igor Prokopenkov <cmyk777@gmail.com>
Date: Tue, 2 Sep 2014 15:06:54 +0300
Subject: [PATCH 1/3] Fixed undefined index notices Fixed misspelling in the
 comment

Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
---
 libraries/replication.inc.php     | 4 ++--
 libraries/replication_gui.lib.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php
index 1ef25a1c0f..4caab99807 100644
--- a/libraries/replication.inc.php
+++ b/libraries/replication.inc.php
@@ -21,9 +21,9 @@ $server_master_replication = $GLOBALS['dbi']->fetchResult('SHOW MASTER STATUS');
 $server_slave_multi_replication = $GLOBALS['dbi']->fetchResult('SHOW ALL SLAVES STATUS');
 
 /**
- * set slave selected server
+ * set selected master server
  */
-if ($server_slave_multi_replication && $_REQUEST['master_connection']) {
+if ($server_slave_multi_replication && isset($_REQUEST['master_connection'])) {
     $GLOBALS['dbi']->query("SET @@default_master_connection = '" . PMA_Util::sqlAddSlashes($_REQUEST['master_connection']) . "'");
     $GLOBALS['url_params']['master_connection'] = $_REQUEST['master_connection'];
 }
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index c5bbb2c4d8..44ca155bb2 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -142,12 +142,12 @@ function PMA_getHtmlForSlaveConfiguration(
     if ($GLOBALS['server_slave_multi_replication']) {
         $html .= __('Master connection:');
         $html .= '<form method="get" action="server_replication.php">';
-        $html .= PMA_URL_getHiddenInputs($url_params);
+        $html .= PMA_URL_getHiddenInputs($GLOBALS['url_params']);
         $html .= ' <select name="master_connection">';
         $html .= '<option value="">' . __('Default') . '</option>';
         foreach ($GLOBALS['server_slave_multi_replication'] as $server) {
-            $html .= '<option' . ($server['Connection_name'] == $_REQUEST['master_connection'] ? ' selected="selected"' : '') . '>' .
-            $server['Connection_name'] . '</option>';
+            $html .= '<option' . (isset($_REQUEST['master_connection']) && $_REQUEST['master_connection'] == $server['Connection_name'] 
+                ? ' selected="selected"' : '') . '>' . $server['Connection_name'] . '</option>';
         }
         $html .= '</select>';
         $html .= ' <input type="submit" value="' . __('Go') . '" id="goButton" />';

From b497324ad6190b181a477c959ec3a9c5fc8fd351 Mon Sep 17 00:00:00 2001
From: Igor Prokopenkov <cmyk777@gmail.com>
Date: Tue, 2 Sep 2014 15:13:39 +0300
Subject: [PATCH 2/3] Removed trailing whitespace

Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
---
 libraries/replication_gui.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index 44ca155bb2..f69ff4ee32 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -146,8 +146,8 @@ function PMA_getHtmlForSlaveConfiguration(
         $html .= ' <select name="master_connection">';
         $html .= '<option value="">' . __('Default') . '</option>';
         foreach ($GLOBALS['server_slave_multi_replication'] as $server) {
-            $html .= '<option' . (isset($_REQUEST['master_connection']) && $_REQUEST['master_connection'] == $server['Connection_name'] 
-                ? ' selected="selected"' : '') . '>' . $server['Connection_name'] . '</option>';
+            $html .= '<option' . (isset($_REQUEST['master_connection']) && $_REQUEST['master_connection'] == $server['Connection_name'] ?
+                ' selected="selected"' : '') . '>' . $server['Connection_name'] . '</option>';
         }
         $html .= '</select>';
         $html .= ' <input type="submit" value="' . __('Go') . '" id="goButton" />';

From adb0ad4fb80c8b1b65388e57fd9c64957a7e3aa6 Mon Sep 17 00:00:00 2001
From: Igor Prokopenkov <cmyk777@gmail.com>
Date: Wed, 3 Sep 2014 12:50:12 +0300
Subject: [PATCH 3/3] 
 https://github.com/phpmyadmin/phpmyadmin/pull/1351/files#r16997280

Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
---
 libraries/replication.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php
index 4caab99807..e9f93fe1b2 100644
--- a/libraries/replication.inc.php
+++ b/libraries/replication.inc.php
@@ -23,7 +23,7 @@ $server_slave_multi_replication = $GLOBALS['dbi']->fetchResult('SHOW ALL SLAVES
 /**
  * set selected master server
  */
-if ($server_slave_multi_replication && isset($_REQUEST['master_connection'])) {
+if ($server_slave_multi_replication && !empty($_REQUEST['master_connection'])) {
     $GLOBALS['dbi']->query("SET @@default_master_connection = '" . PMA_Util::sqlAddSlashes($_REQUEST['master_connection']) . "'");
     $GLOBALS['url_params']['master_connection'] = $_REQUEST['master_connection'];
 }