Merge pull request #8021 from mostafakhudair/patch-2

kenjis · web-flow · commit 54d188b16e86 · 2023-12-26T10:09:08.000+09:00
refactor: rely on $config property in ViewDecoratorTrait
diff --git a/system/View/ViewDecoratorTrait.php b/system/View/ViewDecoratorTrait.php
@@ -22,7 +22,7 @@ trait ViewDecoratorTrait
      */
     protected function decorateOutput(string $html): string
     {
-        $decorators = \config(ViewConfig::class)->decorators;
+        $decorators = $this->config->decorators ?? config(ViewConfig::class)->decorators;
 
         foreach ($decorators as $decorator) {
             if (! is_subclass_of($decorator, ViewDecoratorInterface::class)) {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ trait ViewDecoratorTrait`
`22`	`22`	`*/`
`23`	`23`	`protected function decorateOutput(string $html): string`
`24`	`24`	`{`
`25`		`- $decorators = \config(ViewConfig::class)->decorators;`
	`25`	`+ $decorators = $this->config->decorators ?? config(ViewConfig::class)->decorators;`
`26`	`26`
`27`	`27`	`foreach ($decorators as $decorator) {`
`28`	`28`	`if (! is_subclass_of($decorator, ViewDecoratorInterface::class)) {`