Merge commit 'v2.1.0'

Conflicts:
	user_guide/changelog.html
	user_guide/database/active_record.html
	user_guide/database/caching.html
	user_guide/database/call_function.html
	user_guide/database/configuration.html
	user_guide/database/connecting.html
	user_guide/database/examples.html
	user_guide/database/fields.html
	user_guide/database/forge.html
	user_guide/database/helpers.html
	user_guide/database/index.html
	user_guide/database/queries.html
	user_guide/database/results.html
	user_guide/database/table_data.html
	user_guide/database/transactions.html
	user_guide/database/utilities.html
	user_guide/doc_style/index.html
	user_guide/general/alternative_php.html
	user_guide/general/ancillary_classes.html
	user_guide/general/autoloader.html
	user_guide/general/caching.html
	user_guide/general/cli.html
	user_guide/general/common_functions.html
	user_guide/general/controllers.html
	user_guide/general/core_classes.html
	user_guide/general/creating_drivers.html
	user_guide/general/creating_libraries.html
	user_guide/general/credits.html
	user_guide/general/drivers.html
	user_guide/general/environments.html
	user_guide/general/errors.html
	user_guide/general/helpers.html
	user_guide/general/hooks.html
	user_guide/general/libraries.html
	user_guide/general/managing_apps.html
	user_guide/general/models.html
	user_guide/general/profiling.html
	user_guide/general/quick_reference.html
	user_guide/general/requirements.html
	user_guide/general/reserved_names.html
	user_guide/general/routing.html
	user_guide/general/security.html
	user_guide/general/styleguide.html
	user_guide/general/urls.html
	user_guide/general/views.html
	user_guide/helpers/array_helper.html
	user_guide/helpers/captcha_helper.html
	user_guide/helpers/cookie_helper.html
	user_guide/helpers/date_helper.html
	user_guide/helpers/directory_helper.html
	user_guide/helpers/download_helper.html
	user_guide/helpers/email_helper.html
	user_guide/helpers/file_helper.html
	user_guide/helpers/form_helper.html
	user_guide/helpers/html_helper.html
	user_guide/helpers/inflector_helper.html
	user_guide/helpers/language_helper.html
	user_guide/helpers/number_helper.html
	user_guide/helpers/path_helper.html
	user_guide/helpers/security_helper.html
	user_guide/helpers/smiley_helper.html
	user_guide/helpers/string_helper.html
	user_guide/helpers/text_helper.html
	user_guide/helpers/typography_helper.html
	user_guide/helpers/url_helper.html
	user_guide/helpers/xml_helper.html
	user_guide/images/appflowchart.gif
	user_guide/index.html
	user_guide/installation/downloads.html
	user_guide/installation/index.html
	user_guide/installation/troubleshooting.html
	user_guide/installation/upgrade_120.html
	user_guide/installation/upgrade_130.html
	user_guide/installation/upgrade_131.html
	user_guide/installation/upgrade_132.html
	user_guide/installation/upgrade_133.html
	user_guide/installation/upgrade_140.html
	user_guide/installation/upgrade_141.html
	user_guide/installation/upgrade_150.html
	user_guide/installation/upgrade_152.html
	user_guide/installation/upgrade_153.html
	user_guide/installation/upgrade_154.html
	user_guide/installation/upgrade_160.html
	user_guide/installation/upgrade_161.html
	user_guide/installation/upgrade_162.html
	user_guide/installation/upgrade_163.html
	user_guide/installation/upgrade_170.html
	user_guide/installation/upgrade_171.html
	user_guide/installation/upgrade_172.html
	user_guide/installation/upgrade_200.html
	user_guide/installation/upgrade_201.html
	user_guide/installation/upgrade_202.html
	user_guide/installation/upgrade_203.html
	user_guide/installation/upgrade_b11.html
	user_guide/installation/upgrading.html
	user_guide/libraries/benchmark.html
	user_guide/libraries/caching.html
	user_guide/libraries/calendar.html
	user_guide/libraries/cart.html
	user_guide/libraries/config.html
	user_guide/libraries/email.html
	user_guide/libraries/encryption.html
	user_guide/libraries/file_uploading.html
	user_guide/libraries/form_validation.html
	user_guide/libraries/ftp.html
	user_guide/libraries/image_lib.html
	user_guide/libraries/input.html
	user_guide/libraries/javascript.html
	user_guide/libraries/language.html
	user_guide/libraries/loader.html
	user_guide/libraries/output.html
	user_guide/libraries/pagination.html
	user_guide/libraries/parser.html
	user_guide/libraries/security.html
	user_guide/libraries/sessions.html
	user_guide/libraries/table.html
	user_guide/libraries/trackback.html
	user_guide/libraries/typography.html
	user_guide/libraries/unit_testing.html
	user_guide/libraries/uri.html
	user_guide/libraries/user_agent.html
	user_guide/libraries/xmlrpc.html
	user_guide/libraries/zip.html
	user_guide/license.html
	user_guide/nav/nav.js
	user_guide/overview/appflow.html
	user_guide/overview/at_a_glance.html
	user_guide/overview/cheatsheets.html
	user_guide/overview/features.html
	user_guide/overview/getting_started.html
	user_guide/overview/goals.html
	user_guide/overview/index.html
	user_guide/overview/mvc.html
	user_guide/toc.html

Signed-off-by: Florian Pritz <bluewind@xinu.at>

1 files changed, 57 insertions, 2 deletions

diff --git a/system/core/Router.php b/system/core/Router.php
index 5e92a04b1..6da667472 100755
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -28,12 +28,54 @@
  */
 class CI_Router {
 
+	/**
+	 * Config class
+	 *
+	 * @var object
+	 * @access public
+	 */
 	var $config;
+	/**
+	 * List of routes
+	 *
+	 * @var array
+	 * @access public
+	 */
 	var $routes			= array();
+	/**
+	 * List of error routes
+	 *
+	 * @var array
+	 * @access public
+	 */
 	var $error_routes	= array();
+	/**
+	 * Current class name
+	 *
+	 * @var string
+	 * @access public
+	 */
 	var $class			= '';
+	/**
+	 * Current method name
+	 *
+	 * @var string
+	 * @access public
+	 */
 	var $method			= 'index';
+	/**
+	 * Sub-directory that contains the requested controller class
+	 *
+	 * @var string
+	 * @access public
+	 */
 	var $directory		= '';
+	/**
+	 * Default controller (and method if specific)
+	 *
+	 * @var string
+	 * @access public
+	 */
 	var $default_controller;
 
 	/**
@@ -95,7 +137,7 @@ class CI_Router {
 		{
 			include(APPPATH.'config/routes.php');
 		}
-		
+
 		$this->routes = ( ! isset($route) OR ! is_array($route)) ? array() : $route;
 		unset($route);
 
@@ -244,7 +286,20 @@ class CI_Router {
 				// Does the requested controller exist in the sub-folder?
 				if ( ! file_exists(APPPATH.'controllers/'.$this->fetch_directory().$segments[0].'.php'))
 				{
-					show_404($this->fetch_directory().$segments[0]);
+					if ( ! empty($this->routes['404_override']))
+					{
+						$x = explode('/', $this->routes['404_override']);
+
+						$this->set_directory('');
+						$this->set_class($x[0]);
+						$this->set_method(isset($x[1]) ? $x[1] : 'index');
+
+						return $x;
+					}
+					else
+					{
+						show_404($this->fetch_directory().$segments[0]);
+					}
 				}
 			}
 			else