Merge remote-tracking branch 'trigger/MAGETWO-96231' into BugFixPR

Joan He · Joan He · commit 2028bb134cdf · 2018-11-13T08:44:37.000-06:00
diff --git a/pub/index.php b/pub/index.php
@@ -26,7 +26,7 @@
 
 $params = $_SERVER;
 $params[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS] = array_replace_recursive(
-    $params[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS],
+    $params[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS] ?? [],
     [
         DirectoryList::PUB => [DirectoryList::URL_PATH => ''],
         DirectoryList::MEDIA => [DirectoryList::URL_PATH => 'media'],

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`
`27`	`27`	`$params = $_SERVER;`
`28`	`28`	`$params[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS] = array_replace_recursive(`
`29`		`- $params[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS],`
	`29`	`+ $params[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS] ?? [],`
`30`	`30`	`[`
`31`	`31`	`DirectoryList::PUB => [DirectoryList::URL_PATH => ''],`
`32`	`32`	`DirectoryList::MEDIA => [DirectoryList::URL_PATH => 'media'],`