handle controller empty return

komeiji-satori · komeiji-satori · commit efad31da2333 · 2018-07-26T23:55:51.000+08:00
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
@@ -472,6 +472,9 @@ function &get_instance()
     }
 }
 $result = $reflect_class->getMethod($method)->invokeArgs($CI, $context_args);
+if (is_null($result)) {
+    return;
+}
 if (!empty($GLOBALS['_php_error'])) {
     if (!isset($result['_php_error'])) {
         $result['_php_error'] = $GLOBALS['_php_error'];

Original file line number	Diff line number	Diff line change
`@@ -472,6 +472,9 @@ function &get_instance()`
`472`	`472`	`}`
`473`	`473`	`}`
`474`	`474`	`$result = $reflect_class->getMethod($method)->invokeArgs($CI, $context_args);`
	`475`	`+if (is_null($result)) {`
	`476`	`+ return;`
	`477`	`+}`
`475`	`478`	`if (!empty($GLOBALS['_php_error'])) {`
`476`	`479`	`if (!isset($result['_php_error'])) {`
`477`	`480`	`$result['_php_error'] = $GLOBALS['_php_error'];`