|
@@ -548,8 +548,8 @@ |
|
|
block discarded – undo |
|
548
|
548
|
*/ |
|
549
|
549
|
public function isInherited(InheritableSettingsModel $settingCollection, $settingName) |
|
550
|
550
|
{ |
|
551
|
|
- $explicitInherit = array_key_exists($settingName, (array)$settingCollection->inherited); |
|
552
|
|
- $explicitOverride = array_key_exists($settingName, (array)$settingCollection->overrides); |
|
|
551
|
+ $explicitInherit = array_key_exists($settingName, (array) $settingCollection->inherited); |
|
|
552
|
+ $explicitOverride = array_key_exists($settingName, (array) $settingCollection->overrides); |
|
553
|
553
|
|
|
554
|
554
|
if ($explicitInherit || $explicitOverride) { |
|
555
|
555
|
return $explicitInherit && !$explicitOverride; |
Please login to merge, or discard this patch.