Merge pull request #951 from pphysch/xdmod8.5

Fixed loading the organization abbrevation from organization.json
ubccr · Jun 26, 2020 · 6d6ec85 · 6d6ec85
2 parents 2ab2bdf + c6d85c7
commit 6d6ec85
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/configuration/linker.php b/configuration/linker.php
@@ -196,7 +196,11 @@ function global_uncaught_exception_handler($exception)
     CONFIG_DIR
 );
 define('ORGANIZATION_NAME', $org['name']);
-define('ORGANIZATION_NAME_ABBREV', $org['name']);
+$org_abbrev = $org['abbrev'];
+if (empty($org_abbrev)) {
+    $org_abbrev = ORGANIZATION_NAME;
+};
+define('ORGANIZATION_NAME_ABBREV', $org_abbrev);
 
 $hierarchy = \Configuration\XdmodConfiguration::assocArrayFactory(
     'hierarchy.json',