Fixed #15090: Update Magento_Config module to allow admin/url/use_custom in env.php

davidalger · davidalger · commit 8434d74abd63 · 2019-04-10T15:41:25.000-05:00
diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php
@@ -56,8 +56,9 @@ public function beforeSave()
     {
         $value = $this->getValue();
         if ($value == 1) {
-            $customUrl = $this->getData('groups/url/fields/custom/value');
-            if (empty($customUrl)) {
+            $customUrlField = $this->getData('groups/url/fields/custom/value');
+            $customUrlConfig = $this->_config->getValue('admin/url/custom');
+            if (empty($customUrlField) && empty($customUrlConfig)) {
                 throw new \Magento\Framework\Exception\LocalizedException(__('Please specify the admin custom URL.'));
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,9 @@ public function beforeSave()`
`56`	`56`	`{`
`57`	`57`	`$value = $this->getValue();`
`58`	`58`	`if ($value == 1) {`
`59`		`- $customUrl = $this->getData('groups/url/fields/custom/value');`
`60`		`- if (empty($customUrl)) {`
	`59`	`+ $customUrlField = $this->getData('groups/url/fields/custom/value');`
	`60`	`+ $customUrlConfig = $this->_config->getValue('admin/url/custom');`
	`61`	`+ if (empty($customUrlField) && empty($customUrlConfig)) {`
`61`	`62`	`throw new \Magento\Framework\Exception\LocalizedException(__('Please specify the admin custom URL.'));`
`62`	`63`	`}`
`63`	`64`	`}`