MAGETWO-66683: Allow extending config variables #6989

vrann · vrann · commit 1325e7e6e544 · 2017-03-23T18:46:09.000-07:00
- Merge Pull Request #6989 from adragus-inviqa/magento2:patch-7
diff --git a/app/code/Magento/Email/Model/Source/Variables.php b/app/code/Magento/Email/Model/Source/Variables.php
@@ -61,7 +61,7 @@ public function __construct()
     public function toOptionArray($withGroup = false)
     {
         $optionArray = [];
-        foreach ($this->_configVariables as $variable) {
+        foreach ($this->getData() as $variable) {
             $optionArray[] = [
                 'value' => '{{config path="' . $variable['value'] . '"}}',
                 'label' => $variable['label'],
@@ -81,6 +81,6 @@ public function toOptionArray($withGroup = false)
      */
     public function getData()
     {
-        return  $this->_configVariables;
+        return $this->_configVariables;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function __construct()`
`61`	`61`	`public function toOptionArray($withGroup = false)`
`62`	`62`	`{`
`63`	`63`	`$optionArray = [];`
`64`		`- foreach ($this->_configVariables as $variable) {`
	`64`	`+ foreach ($this->getData() as $variable) {`
`65`	`65`	`$optionArray[] = [`
`66`	`66`	`'value' => '{{config path="' . $variable['value'] . '"}}',`
`67`	`67`	`'label' => $variable['label'],`
`@@ -81,6 +81,6 @@ public function toOptionArray($withGroup = false)`
`81`	`81`	`*/`
`82`	`82`	`public function getData()`
`83`	`83`	`{`
`84`		`- return $this->_configVariables;`
	`84`	`+ return $this->_configVariables;`
`85`	`85`	`}`
`86`	`86`	`}`