From 2a863ba74614deeea965523cf2830c3daecfd38d Mon Sep 17 00:00:00 2001
From: Diogo Cordeiro <diogo@fc.up.pt>
Date: Tue, 4 Aug 2020 01:36:21 +0100
Subject: [PATCH] [MODULES] Make default loading attributes available in global
 config

---
 lib/util/gnusocial.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/util/gnusocial.php b/lib/util/gnusocial.php
index 176b59d331..72597d2c6d 100644
--- a/lib/util/gnusocial.php
+++ b/lib/util/gnusocial.php
@@ -76,7 +76,12 @@ class GNUsocial
         // TODO: put into a static array that makes sure $inst isn't lost.
         $inst = new $moduleclass();
         foreach ($attrs as $aname => $avalue) {
-            $inst->$aname = $avalue;
+            // Only apply default if a user preference wasn't set
+            if (common_config($moduleclass, $aname) === false) {
+                $inst->$aname = $avalue;
+                // Module attributes shall be part of global config
+                common_config_set($moduleclass, $aname, $avalue);
+            }
         }
 
         // Record activated modules for later display/config dump