CRM-19303 - Paths - Allow sysadmin to explicitly [civicrm.*] variables

civicrm · Jun 15, 2017 · 313a57a · 313a57a
1 parent 4ac7577
commit 313a57a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Civi/Core/Paths.php b/Civi/Core/Paths.php
@@ -78,6 +78,9 @@ public function register($name, $factory) {
   public function getVariable($name, $attr) {
     if (!isset($this->variables[$name])) {
       $this->variables[$name] = call_user_func($this->variableFactory[$name]);
+      if (isset($GLOBALS['civicrm_paths'][$name])) {
+        $this->variables[$name] = array_merge($this->variables[$name], $GLOBALS['civicrm_paths'][$name]);
+      }
     }
     if (!isset($this->variables[$name][$attr])) {
       throw new \RuntimeException("Cannot resolve path using \"$name.$attr\"");