From 8dc2b92d667f1401ab9f1315a36add61658f899c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 6 May 2021 10:26:09 +0200
Subject: Moderize Database handling

* Auto-convert to utf8mb4_unicode_520_ci
* Use foreach instead of while to loop over results
* Drop useless statement caching
* Keep emulated prepares, as we sometimes loop over nested queries
---
 modules-available/permissionmanager/inc/permissionutil.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules-available/permissionmanager/inc/permissionutil.inc.php')

diff --git a/modules-available/permissionmanager/inc/permissionutil.inc.php b/modules-available/permissionmanager/inc/permissionutil.inc.php
index 6aa97600..48ebb77e 100644
--- a/modules-available/permissionmanager/inc/permissionutil.inc.php
+++ b/modules-available/permissionmanager/inc/permissionutil.inc.php
@@ -124,7 +124,7 @@ class PermissionUtil
 		}
 		self::makeComparisonVariants($parts, $compare, $wildcard, $wclen);
 		$retval = false;
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if (in_array($row['permissionid'], $compare, true)
 					|| ($wildcard !== false && strncmp($row['permissionid'], $wildcard, $wclen) === 0)) {
 				if (!$cacheAll || ($row['locationid'] == $locationid) || $row['locationid'] === null) {
@@ -178,7 +178,7 @@ class PermissionUtil
 			// Gather locationid from relevant rows
 			self::makeComparisonVariants($parts, $compare, $wildcard, $wclen);
 			$allowedLocations = array();
-			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			foreach ($res as $row) {
 				if (in_array($row['permissionid'], $compare, true)
 					|| ($wildcard !== false && strncmp($row['permissionid'], $wildcard, $wclen) === 0)) {
 					$allowedLocations[(int)$row['locationid']] = true;
-- 
cgit v1.2.3-55-g7522