nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge conflicts for upstream merge

Browse Source
This commit is contained in:
ninadsp
2010-07-29 19:17:25 +05:30
parent 2bec345a46 d0fc397fe1
commit a2f78a6d38
175 changed files with 76587 additions and 70379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server_replication.php
View File

@@ -14,7 +14,6 @@ require_once './libraries/common.inc.php';
* Does the common work
*/
$GLOBALS['js_include'][] = 'server_privileges.js';
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'replication.js';
require './libraries/server_common.inc.php';
@@ -32,7 +31,7 @@ if (! $is_superuser) {
. __('Replication') . "\n"
. '</h2>' . "\n";
PMA_Message::error(__('No Privileges'))->display();
require_once './libraries/footer.inc.php';
require './libraries/footer.inc.php';
}
/**
@@ -235,7 +234,7 @@ if (isset($GLOBALS['mr_configure'])) {
echo ' </form>';
echo '</fieldset>';
require_once './libraries/footer.inc.php';
require './libraries/footer.inc.php';
exit;
}
@@ -359,5 +358,5 @@ if (! isset($GLOBALS['repl_clear_scr'])) {
if (isset($GLOBALS['sl_configure'])) {
PMA_replication_gui_changemaster("slave_changemaster");
}
require_once './libraries/footer.inc.php';
require './libraries/footer.inc.php';
?>