@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | // Things required to keep the module yii2-debug compatible |
| 177 | 177 | /* @see \yii\debug\Module::$traceLine (since 2.0.7) */ |
| 178 | 178 | public $traceLine = \yii\debug\Module::DEFAULT_IDE_TRACELINE; |
| 179 | - /* @see \yii\debug\Module::$tracePathMappings (since 2.1.6) */ |
|
| 179 | + /* @see \yii\debug\Module::$tracePathMappings (since 2.1.6) */ |
|
| 180 | 180 | public $tracePathMappings = []; |
| 181 | 181 | |
| 182 | 182 | /** |
@@ -350,9 +350,9 @@ discard block |
||
| 350 | 350 | // This code assumes the audit module is already loaded and can thus look for a derived instance |
| 351 | 351 | $loadedModules = Yii::$app->loadedModules; |
| 352 | 352 | foreach ($loadedModules as $module) { |
| 353 | - if ($module instanceof self) { |
|
| 354 | - return self::$_me = $module; |
|
| 355 | - } |
|
| 353 | + if ($module instanceof self) { |
|
| 354 | + return self::$_me = $module; |
|
| 355 | + } |
|
| 356 | 356 | } |
| 357 | 357 | |
| 358 | 358 | // If we're still here, fall back onto the default implementation |
@@ -482,12 +482,12 @@ discard block |
||
| 482 | 482 | |
| 483 | 483 | // We now need one more iteration to add core classes to the panels added via the merge, if needed |
| 484 | 484 | array_walk($this->panels, function(&$value, $key) { |
| 485 | - if (!isset($value['class'])) { |
|
| 486 | - if (isset($this->_corePanels[$key])) |
|
| 487 | - $value = ArrayHelper::merge($value, $this->_corePanels[$key]); |
|
| 488 | - else |
|
| 489 | - throw new InvalidConfigException("Invalid configuration for '$key'. No 'class' specified."); |
|
| 490 | - } |
|
| 485 | + if (!isset($value['class'])) { |
|
| 486 | + if (isset($this->_corePanels[$key])) |
|
| 487 | + $value = ArrayHelper::merge($value, $this->_corePanels[$key]); |
|
| 488 | + else |
|
| 489 | + throw new InvalidConfigException("Invalid configuration for '$key'. No 'class' specified."); |
|
| 490 | + } |
|
| 491 | 491 | }); |
| 492 | 492 | } |
| 493 | 493 | |