Merge branch 'QA_4_6'

2016-06-16 14:05:56 +02:00 · 2016-06-16 14:05:56 +02:00 · d052c4721e
commit d052c4721e
parent 7aa93f824d 1b0fde1b59
1 changed files with 0 additions and 10 deletions
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@ -4213,16 +4213,6 @@ function PMA_addUser(
        );
    }

-    if (!isset($_REQUEST['adduser_submit']) && !isset($_REQUEST['change_copy'])) {
-        return array(
-            $message,
-            $queries,
-            $queries_for_display,
-            $sql_query,
-            $_add_user_error
-        );
-    }
-
    $sql_query = '';
    if ($_POST['pred_username'] == 'any') {
        $username = '';