From 7d916647e1b82fcc8a17b68d3ae0615af42f53e0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 13 May 2016 18:24:08 +0200
Subject: Get baseconfig ready for modularization

---
 modules-available/baseconfig/hooks/translation.inc.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules-available/baseconfig/hooks/translation.inc.php')

diff --git a/modules-available/baseconfig/hooks/translation.inc.php b/modules-available/baseconfig/hooks/translation.inc.php
index 4f2cd8f7..7588fe38 100644
--- a/modules-available/baseconfig/hooks/translation.inc.php
+++ b/modules-available/baseconfig/hooks/translation.inc.php
@@ -18,10 +18,10 @@ $HANDLER['subsections'] = array(
  * Configuration categories
  */
 $HANDLER['grep_config-variable-categories'] = function($module) {
-	$want = array();
-	$res = Database::simpleQuery("SELECT catid FROM cat_setting ORDER BY catid ASC");
-	while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-		$want['cat_' . $row['catid']] = true;
+	$module->activate();
+	$want = BaseConfigUtil::getCategories();
+	foreach ($want as &$entry) {
+		$entry = true;
 	}
 	return $want;
 };
@@ -30,10 +30,10 @@ $HANDLER['grep_config-variable-categories'] = function($module) {
  * Configuration variables
  */
 $HANDLER['grep_config-variables'] = function($module) {
-	$want = array();
-	$res = Database::simpleQuery("SELECT setting FROM setting ORDER BY setting ASC");
-	while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-		$want[$row['setting']] = true;
+	$module->activate();
+	$want = BaseConfigUtil::getVariables();
+	foreach ($want as &$entry) {
+		$entry = true;
 	}
 	return $want;
 };
-- 
cgit v1.2.3-55-g7522