fixed branding issues

Author: hakasapl

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.0-RC2
+* [BugFix] Fixed Unity Branding where Array were not being merged
+
 ## 1.0.0-RC1
 * [Feature] Admins can now access the web portal as a separate user
 * [Feature] Added account details to account settings page

config/branding/overrides/unity.uri.edu.ini

@@ -1,6 +1,5 @@
 [site]
 url = "https://unity.uri.edu/"
-docs_url = "https://docs.unity.uri.edu/"
 
 [colors]
 light_background = "#ffffff"
@@ -16,9 +15,10 @@ accent_2 = "#002b56"
 accent_disabled = "#80bbff"
 accent_foreground = "#ffffff"
 
-[support]
-email = "[email protected]"
-
 [mail]
 support = "[email protected]"
-sender = "[email protected]"
+sender = "[email protected]"
+
+[menuitems]  ; menu items, add a label and link for each
+labels[] = "Documentation"
+links[] = "https://docs.unity.uri.edu/"

resources/lib/UnityBranding.php

@@ -11,8 +11,8 @@ public static function getBranding($branding_loc)
 
         $branding_override = $branding_loc . "/overrides/" . $_SERVER['HTTP_HOST'] . ".ini";
         if (file_exists($branding_override)) {
-            $override_config = parse_ini_file($branding_override);
-            $BRANDING = array_merge($BRANDING, $override_config);
+            $override_config = parse_ini_file($branding_override, true);
+            $BRANDING = array_replace_recursive($BRANDING, $override_config);
         }
 
         return $BRANDING;