From 1ea14f191d4ddd51e2df8ea30e4e3ca24734d172 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 29 Aug 2016 16:57:38 +0200
Subject: [baseconfig*] Fix translation hook to only consider the current
 module

---
 .../baseconfig/inc/baseconfigutil.inc.php             | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'modules-available/baseconfig')

diff --git a/modules-available/baseconfig/inc/baseconfigutil.inc.php b/modules-available/baseconfig/inc/baseconfigutil.inc.php
index 75173ee6..3039ea12 100644
--- a/modules-available/baseconfig/inc/baseconfigutil.inc.php
+++ b/modules-available/baseconfig/inc/baseconfigutil.inc.php
@@ -13,12 +13,18 @@ class BaseConfigUtil
 	 *     validator => xx,
 	 * )
 	 *
+	 * @param \Module $module optional, only consider given module, not all enabled modules
 	 * @return array all known config variables
 	 */
-	public static function getVariables()
+	public static function getVariables($module = false)
 	{
 		$settings = array();
-		foreach (glob('modules/*/baseconfig/settings.json', GLOB_NOSORT) as $file) {
+		if ($module === false) {
+			$module = '*';
+		} else {
+			$module = $module->getIdentifier();
+		}
+		foreach (glob("modules/{$module}/baseconfig/settings.json", GLOB_NOSORT) as $file) {
 			$data = json_decode(file_get_contents($file), true);
 			if (!is_array($data))
 				continue;
@@ -31,10 +37,15 @@ class BaseConfigUtil
 		return $settings;
 	}
 
-	public static function getCategories()
+	public static function getCategories($module = false)
 	{
 		$categories = array();
-		foreach (glob('modules/*/baseconfig/categories.json', GLOB_NOSORT) as $file) {
+		if ($module === false) {
+			$module = '*';
+		} else {
+			$module = $module->getIdentifier();
+		}
+		foreach (glob("modules/{$module}/baseconfig/categories.json", GLOB_NOSORT) as $file) {
 			$data = json_decode(file_get_contents($file), true);
 			if (!is_array($data))
 				continue;
-- 
cgit v1.2.3-55-g7522