diff options
| author | Simon Rettberg | 2021-05-06 10:26:09 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2021-05-11 14:51:13 +0200 |
| commit | 8dc2b92d667f1401ab9f1315a36add61658f899c (patch) | |
| tree | 452c5fe040055884cf9d9ee834415db84999a9a1 /modules-available/baseconfig | |
| parent | [session] Add simple session overview table (diff) | |
| download | slx-admin-8dc2b92d667f1401ab9f1315a36add61658f899c.tar.gz slx-admin-8dc2b92d667f1401ab9f1315a36add61658f899c.tar.xz slx-admin-8dc2b92d667f1401ab9f1315a36add61658f899c.zip | |
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
Diffstat (limited to 'modules-available/baseconfig')
| -rw-r--r-- | modules-available/baseconfig/inc/baseconfig.inc.php | 2 | ||||
| -rw-r--r-- | modules-available/baseconfig/page.inc.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules-available/baseconfig/inc/baseconfig.inc.php b/modules-available/baseconfig/inc/baseconfig.inc.php index 064e0f89..2e8efeda 100644 --- a/modules-available/baseconfig/inc/baseconfig.inc.php +++ b/modules-available/baseconfig/inc/baseconfig.inc.php @@ -83,7 +83,7 @@ class BaseConfig ]; }); $res = Database::simpleQuery('SELECT setting, value, displayvalue FROM setting_global'); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + foreach ($res as $row) { if (!isset($defaults[$row['setting']])) continue; // Setting is not defined in any <module>/baseconfig/settings.json ConfigHolder::add($row['setting'], $row, -1); diff --git a/modules-available/baseconfig/page.inc.php b/modules-available/baseconfig/page.inc.php index 1566464b..7f9bef1f 100644 --- a/modules-available/baseconfig/page.inc.php +++ b/modules-available/baseconfig/page.inc.php @@ -199,7 +199,7 @@ class Page_BaseConfig extends Page { $res = Database::simpleQuery("SELECT setting, value, displayvalue $fields FROM $table " . " {$where} ORDER BY setting ASC", $params); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + foreach ($res as $row) { if (!isset($missing[$row['setting']])) continue; if (!isset($vars[$row['setting']]) || !is_array($vars[$row['setting']])) { |