Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3

This commit is contained in:
Weblate 2014-12-16 15:56:05 +01:00
commit 9894cbdc0c
2 changed files with 2 additions and 1 deletions

View File

@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
- bug #4630 AJAX request infinite loop
- bug #4649 Attributes field size smaller than others
- bug #4622 Cannot remove table ordering on a Mac
- bug Fix initial replication configuration
4.3.2.0 (2014-12-12)
- bug #4628 PHP error while exporting schema as PDF

View File

@ -975,7 +975,7 @@ function PMA_handleRequestForSlaveChangeMaster()
$_SESSION['replication']['m_hostname'] = $sr['hostname']
= PMA_Util::sqlAddSlashes($_REQUEST['hostname']);
$_SESSION['replication']['m_port'] = $sr['port']
= PMA_Util::sqlAddSlashes($_REQUEST['port']);
= PMA_Util::sqlAddSlashes($_REQUEST['text_port']);
$_SESSION['replication']['m_correct'] = '';
$_SESSION['replication']['sr_action_status'] = 'error';
$_SESSION['replication']['sr_action_info'] = __('Unknown error');