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

diff --git a/Civi/Core/Paths.php b/Civi/Core/Paths.php
index 07b16f10a32815f1eae51b4534569c4d35783475..718b4bc29436744bd75584964b426db3da27cb4c 100644 (file)
--- a/Civi/Core/Paths.php
+++ b/Civi/Core/Paths.php
@@ -78,6 +78,9 @@ class Paths {
   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\"");