Fix some failing tests

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · May 1, 2020 · 7db0deb · 7db0deb
1 parent 2c1d08b
commit 7db0deb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/libraries/classes/Controllers/Database/OperationsController.php b/libraries/classes/Controllers/Database/OperationsController.php
@@ -244,7 +244,7 @@ public function index(): void
                 $this->response->addJSON('newname', $_POST['newname']);
                 $this->response->addJSON(
                     'sql_query',
-                    Generator::getMessage(null, $sql_query)
+                    Generator::getMessage('', $sql_query)
                 );
                 $this->response->addJSON('db', $db);
                 return;

diff --git a/libraries/classes/Controllers/Server/DatabasesController.php b/libraries/classes/Controllers/Server/DatabasesController.php
@@ -246,7 +246,7 @@ public function create(): void
 
             $json = [
                 'message' => $message,
-                'sql_query' => Generator::getMessage(null, $sqlQuery, 'success'),
+                'sql_query' => Generator::getMessage('', $sqlQuery, 'success'),
                 'url_query' => $scriptName . Url::getCommon(
                     ['db' => $params['new_db']],
                     strpos($scriptName, '?') === false ? '?' : '&'

diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php
@@ -1716,7 +1716,7 @@ public function getExtraDataForAjaxBehavior(
 
         $extra_data = [];
         if (strlen($sql_query) > 0) {
-            $extra_data['sql_query'] = Generator::getMessage(null, $sql_query);
+            $extra_data['sql_query'] = Generator::getMessage('', $sql_query);
         }
 
         if (isset($_POST['change_copy'])) {

diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php
@@ -1516,7 +1516,7 @@ public function testGetExtraDataForAjaxBehavior()
 
         //sql_query
         $this->assertEquals(
-            Generator::getMessage(null, $sql_query),
+            Generator::getMessage('', $sql_query),
             $extra_data['sql_query']
         );