diff options
author | Rouslan Placella <rouslan@placella.com> | 2012-11-05 03:19:56 +0400 |
---|---|---|
committer | Rouslan Placella <rouslan@placella.com> | 2012-11-05 03:19:56 +0400 |
commit | a31140d1598fd4397451eb2409cebebe160d023a (patch) | |
tree | 099855d2b3a7453916b470d4a5160bbd95c06410 /server_replication.php | |
parent | 9c280588c11c041de5ef5f57540ec5b54878c3b9 (diff) |
Partial fix for bug #3583312 - Broken replication forms/links
Diffstat (limited to 'server_replication.php')
-rw-r--r-- | server_replication.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/server_replication.php b/server_replication.php index 953a895c2e..bec3b785a9 100644 --- a/server_replication.php +++ b/server_replication.php @@ -203,7 +203,7 @@ if (isset($GLOBALS['sr_take_action'])) { } if ($refresh) { - Header("Location: ". PMA_generate_common_url($GLOBALS['url_params'])); + Header("Location: server_replication.php" . PMA_generate_common_url($GLOBALS['url_params'])); } unset($refresh); } @@ -246,7 +246,7 @@ if ($server_master_status) { $_url_params['mr_adduser'] = true; $_url_params['repl_clear_scr'] = true; - echo ' <li><a href="' . PMA_generate_common_url($_url_params) . '" id="master_addslaveuser_href">'; + echo ' <li><a href="server_replication.php' . PMA_generate_common_url($_url_params) . '" id="master_addslaveuser_href">'; echo __('Add slave replication user') . '</a></li>'; } @@ -263,7 +263,7 @@ if ($server_master_status) { echo '<fieldset>'; echo '<legend>' . __('Master replication') . '</legend>'; - echo sprintf(__('This server is not configured as master in a replication process. Would you like to <a href="%s">configure</a> it?'), PMA_generate_common_url($_url_params)); + echo sprintf(__('This server is not configured as master in a replication process. Would you like to <a href="%s">configure</a> it?'), 'server_replication.php' . PMA_generate_common_url($_url_params)); echo '</fieldset>'; } @@ -315,7 +315,7 @@ if (! isset($GLOBALS['repl_clear_scr'])) { } $_url_params['sr_slave_control_parm'] = 'IO_THREAD'; - $slave_control_io_link = PMA_generate_common_url($_url_params); + $slave_control_io_link = 'server_replication.php' . PMA_generate_common_url($_url_params); if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') { $_url_params['sr_slave_action'] = 'start'; @@ -324,7 +324,7 @@ if (! isset($GLOBALS['repl_clear_scr'])) { } $_url_params['sr_slave_control_parm'] = 'SQL_THREAD'; - $slave_control_sql_link = PMA_generate_common_url($_url_params); + $slave_control_sql_link = 'server_replication.php' . PMA_generate_common_url($_url_params); if ($server_slave_replication[0]['Slave_IO_Running'] == 'No' || $server_slave_replication[0]['Slave_SQL_Running'] == 'No' @@ -335,14 +335,14 @@ if (! isset($GLOBALS['repl_clear_scr'])) { } $_url_params['sr_slave_control_parm'] = null; - $slave_control_full_link = PMA_generate_common_url($_url_params); + $slave_control_full_link = 'server_replication.php' . PMA_generate_common_url($_url_params); $_url_params['sr_slave_action'] = 'reset'; - $slave_control_reset_link = PMA_generate_common_url($_url_params); + $slave_control_reset_link = 'server_replication.php' . PMA_generate_common_url($_url_params); $_url_params = $GLOBALS['url_params']; $_url_params['sr_slave_skip_error'] = true; - $slave_skip_error_link = PMA_generate_common_url($_url_params); + $slave_skip_error_link = 'server_replication.php' . PMA_generate_common_url($_url_params); if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') { PMA_Message::error(__('Slave SQL Thread not running!'))->display(); @@ -355,7 +355,7 @@ if (! isset($GLOBALS['repl_clear_scr'])) { $_url_params['sl_configure'] = true; $_url_params['repl_clear_scr'] = true; - $reconfiguremaster_link = PMA_generate_common_url($_url_params); + $reconfiguremaster_link = 'server_replication.php' . PMA_generate_common_url($_url_params); echo __('Server is configured as slave in a replication process. Would you like to:'); echo '<br />'; @@ -417,7 +417,7 @@ if (! isset($GLOBALS['repl_clear_scr'])) { $_url_params['sl_configure'] = true; $_url_params['repl_clear_scr'] = true; - echo sprintf(__('This server is not configured as slave in a replication process. Would you like to <a href="%s">configure</a> it?'), PMA_generate_common_url($_url_params)); + echo sprintf(__('This server is not configured as slave in a replication process. Would you like to <a href="%s">configure</a> it?'), 'server_replication.php' . PMA_generate_common_url($_url_params)); } echo '</fieldset>'; } |