Merge pull request #18588 from kamil-tekiela/Fix-privileges

MauricioFauth · web-flow · commit b47f4b886484 · 2023-08-26T15:36:54.000-03:00
Fix HTML added to the notification when a new user is created
diff --git a/libraries/classes/Controllers/Server/PrivilegesController.php b/libraries/classes/Controllers/Server/PrivilegesController.php
@@ -66,8 +66,9 @@ public function __invoke(ServerRequest $request): void
             new Plugins($this->dbi),
         );
 
-        if ($relationParameters->configurableMenusFeature !== null) {
-            $this->response->addHTML('<div class="container-fluid">');
+        $this->response->addHTML('<div class="container-fluid">');
+
+        if ($relationParameters->configurableMenusFeature !== null && ! $request->isAjax()) {
             $this->render('server/privileges/subnav', [
                 'active' => 'privileges',
                 'is_super_user' => $this->dbi->isSuperUser(),
diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
@@ -1436,12 +1436,7 @@ public function isSuperUser(): bool
             return false;
         }
 
-        $result = $this->tryQuery('SELECT 1 FROM mysql.user LIMIT 1');
-        $isSuperUser = false;
-
-        if ($result) {
-            $isSuperUser = (bool) $result->numRows();
-        }
+        $isSuperUser = (bool) $this->fetchValue('SELECT 1 FROM mysql.user LIMIT 1');
 
         SessionCache::set('is_superuser', $isSuperUser);
 
@@ -1477,11 +1472,7 @@ public function isGrantUser(): bool
 
         [$user, $host] = $this->getCurrentUserAndHost();
         $query = QueryGenerator::getInformationSchemaDataForGranteeRequest($user, $host);
-        $result = $this->tryQuery($query);
-
-        if ($result) {
-            $hasGrantPrivilege = (bool) $result->numRows();
-        }
+        $hasGrantPrivilege = (bool) $this->fetchValue($query);
 
         SessionCache::set('is_grantuser', $hasGrantPrivilege);
 
@@ -1517,11 +1508,7 @@ public function isCreateUser(): bool
 
         [$user, $host] = $this->getCurrentUserAndHost();
         $query = QueryGenerator::getInformationSchemaDataForCreateRequest($user, $host);
-        $result = $this->tryQuery($query);
-
-        if ($result) {
-            $hasCreatePrivilege = (bool) $result->numRows();
-        }
+        $hasCreatePrivilege = (bool) $this->fetchValue($query);
 
         SessionCache::set('is_createuser', $hasCreatePrivilege);
 
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -10570,11 +10570,6 @@ parameters:
 			count: 3
 			path: libraries/classes/DatabaseInterface.php
 
-		-
-			message: "#^Only booleans are allowed in an if condition, PhpMyAdmin\\\\Dbal\\\\ResultInterface\\|false given\\.$#"
-			count: 3
-			path: libraries/classes/DatabaseInterface.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, bool\\|string given\\.$#"
 			count: 1
