The branch, master has been updated
via 354d5d26c9a4795c6ee5d3e0acbdafaf0d305e8a (commit)
from 9bc7ffd3bcc6b9f5614be6e1aff7f76998a600e1 (commit)
- Log -----------------------------------------------------------------
commit 354d5d26c9a4795c6ee5d3e0acbdafaf0d305e8a
Author: Michal Čihař <michal(a)cihar.com>
Date: Tue Apr 20 08:04:02 2010 +0200
Fix handling of preselected servers from config.
-----------------------------------------------------------------------
Summary of changes:
server_synchronize.php | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server_synchronize.php b/server_synchronize.php
index 365a431..440103d 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -83,17 +83,17 @@ if ((isset($_REQUEST['submit_connect']))) {
${"{$con}_connection"} =
PMA_DBI_connect(${"{$con}_username"}, ${"{$con}_password"},
$is_controluser = false, ${"{$con}_server"}, $auxiliary_connection = true);
} // end foreach ($cons as $con)
- if ((! $src_connection && $src_type == 'rmt') || (! $trg_connection
&& $trg_type == 'rmt')) {
+ if ((! $src_connection && $src_type != 'cur') || (! $trg_connection
&& $trg_type != 'cur')) {
/**
* Displays the connection error string if
* connections are not established
*/
echo '<div class="error">';
- if(! $src_connection && $src_type == 'rmt') {
+ if(! $src_connection && $src_type != 'cur') {
echo $GLOBALS['strCouldNotConnectSource'] . '<br />';
}
- if(! $trg_connection && $trg_type == 'rmt'){
+ if(! $trg_connection && $trg_type != 'cur'){
echo $GLOBALS['strCouldNotConnectTarget'];
}
echo '</div>';
@@ -515,7 +515,7 @@ if (isset($_REQUEST['Table_ids'])) {
* Creating link object for source and target databases
*/
foreach ($cons as $con) {
- if (${"{$con}_type"} == "rmt") {
+ if (${"{$con}_type"} != "cur") {
${"{$con}_link"} = PMA_DBI_connect(${"{$con}_username"},
${"{$con}_password"}, $is_controluser = false, ${"{$con}_server"});
} else {
${"{$con}_link"} = null;
@@ -993,7 +993,7 @@ if (isset($_REQUEST['synchronize_db'])) {
/**
* connecting the source and target servers
*/
- if ('rmt' == $_SESSION['src_type']) {
+ if ('cur' != $_SESSION['src_type']) {
$src_link = PMA_DBI_connect($src_username, $src_password, $is_controluser =
false, $_SESSION['src_server']);
} else {
$src_link = $GLOBALS['userlink'];
@@ -1001,7 +1001,7 @@ if (isset($_REQUEST['synchronize_db'])) {
// (does not work if user defined current server as a remote one)
$GLOBALS['db'] = $_SESSION['src_db'];
}
- if ('rmt' == $_SESSION['trg_type']) {
+ if ('cur' != $_SESSION['trg_type']) {
$trg_link = PMA_DBI_connect($trg_username, $trg_password, $is_controluser =
false, $_SESSION['trg_server']);
} else {
$trg_link = $GLOBALS['userlink'];
hooks/post-receive
--
phpMyAdmin