Merge branch 'develop' of github.com:bcit-ci/CodeIgniter4 into develop

lonnieezell · lonnieezell · commit 412e16349181 · 2018-08-13T23:16:16.000-05:00
diff --git a/system/View/Parser.php b/system/View/Parser.php
@@ -129,12 +129,12 @@ public function render(string $view, array $options = null, $saveData = null): s
 			$saveData = $this->config->saveData;
 		}
 
-		$view = str_replace('.php', '', $view) . '.php';
+		$view = str_replace('.php', '', $view);
 
 		// Was it cached?
 		if (isset($options['cache']))
 		{
-			$cacheName = $options['cache_name'] ?: str_replace('.php', '', $view);
+			$cacheName = $options['cache_name'] ?: $view;
 
 			if ($output = cache($cacheName))
 			{
@@ -143,6 +143,7 @@ public function render(string $view, array $options = null, $saveData = null): s
 			}
 		}
 
+               $view = $view . '.php';
 		$file = $this->viewPath . $view;
 
 		if ( ! file_exists($file))

Original file line number	Diff line number	Diff line change
`@@ -129,12 +129,12 @@ public function render(string $view, array $options = null, $saveData = null): s`
`129`	`129`	`$saveData = $this->config->saveData;`
`130`	`130`	`}`
`131`	`131`
`132`		`- $view = str_replace('.php', '', $view) . '.php';`
	`132`	`+ $view = str_replace('.php', '', $view);`
`133`	`133`
`134`	`134`	`// Was it cached?`
`135`	`135`	`if (isset($options['cache']))`
`136`	`136`	`{`
`137`		`- $cacheName = $options['cache_name'] ?: str_replace('.php', '', $view);`
	`137`	`+ $cacheName = $options['cache_name'] ?: $view;`
`138`	`138`
`139`	`139`	`if ($output = cache($cacheName))`
`140`	`140`	`{`
`@@ -143,6 +143,7 @@ public function render(string $view, array $options = null, $saveData = null): s`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`
	`146`	`+ $view = $view . '.php';`
`146`	`147`	`$file = $this->viewPath . $view;`
`147`	`148`
`148`	`149`	`if ( ! file_exists($file))`