Merge branch '7.x'

GrahamCampbell · GrahamCampbell · commit d821e649e650 · 2020-06-04T15:55:48.000+01:00
diff --git a/src/Illuminate/Foundation/Exceptions/WhoopsHandler.php b/src/Illuminate/Foundation/Exceptions/WhoopsHandler.php
@@ -60,7 +60,7 @@ protected function directoriesExceptVendor()
      */
     protected function registerBlacklist($handler)
     {
-        foreach (config('app.debug_blacklist', []) as $key => $secrets) {
+        foreach (config('app.debug_blacklist', config('app.debug_hide', [])) as $key => $secrets) {
             foreach ($secrets as $secret) {
                 $handler->blacklist($key, $secret);
             }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ protected function directoriesExceptVendor()`
`60`	`60`	`*/`
`61`	`61`	`protected function registerBlacklist($handler)`
`62`	`62`	`{`
`63`		`- foreach (config('app.debug_blacklist', []) as $key => $secrets) {`
	`63`	`+ foreach (config('app.debug_blacklist', config('app.debug_hide', [])) as $key => $secrets) {`
`64`	`64`	`foreach ($secrets as $secret) {`
`65`	`65`	`$handler->blacklist($key, $secret);`
`66`	`66`	`}`