Merge pull request bcit-ci#4264 from DavidOtis/exceptions/Router

narfbg · narfbg · commit a936f87b014b · 2015-11-23T21:53:36.000+02:00
show_error() to RuntimeException in CI_Router
diff --git a/system/core/Router.php b/system/core/Router.php
@@ -285,12 +285,13 @@ protected function _set_request($segments = array())
 	 * Set default controller
 	 *
 	 * @return	void
+	 * @throws	RuntimeException
 	 */
 	protected function _set_default_controller()
 	{
 		if (empty($this->default_controller))
 		{
-			show_error('Unable to determine what should be displayed. A default route has not been specified in the routing file.');
+			throw new RuntimeException('Unable to determine what should be displayed. A default route has not been specified in the routing file.');
 		}
 
 		// Is the method being specified?

Original file line number	Diff line number	Diff line change
`@@ -285,12 +285,13 @@ protected function _set_request($segments = array())`
`285`	`285`	`* Set default controller`
`286`	`286`	`*`
`287`	`287`	`* @return void`
	`288`	`+ * @throws RuntimeException`
`288`	`289`	`*/`
`289`	`290`	`protected function _set_default_controller()`
`290`	`291`	`{`
`291`	`292`	`if (empty($this->default_controller))`
`292`	`293`	`{`
`293`		`- show_error('Unable to determine what should be displayed. A default route has not been specified in the routing file.');`
	`294`	`+ throw new RuntimeException('Unable to determine what should be displayed. A default route has not been specified in the routing file.');`
`294`	`295`	`}`
`295`	`296`
`296`	`297`	`// Is the method being specified?`