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, 111 insertions, 25 deletions

diff --git a/system/core/Loader.php b/system/core/Loader.php
index 7c8b298ac..6b7ee0c28 100755
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -29,18 +29,91 @@
 class CI_Loader {
 
 	// All these are set automatically. Don't mess with them.
+	/**
+	 * Nesting level of the output buffering mechanism
+	 *
+	 * @var int
+	 * @access protected
+	 */
 	protected $_ci_ob_level;
+	/**
+	 * List of paths to load views from
+	 *
+	 * @var array
+	 * @access protected
+	 */
 	protected $_ci_view_paths		= array();
+	/**
+	 * List of paths to load libraries from
+	 *
+	 * @var array
+	 * @access protected
+	 */
 	protected $_ci_library_paths	= array();
+	/**
+	 * List of paths to load models from
+	 *
+	 * @var array
+	 * @access protected
+	 */
 	protected $_ci_model_paths		= array();
+	/**
+	 * List of paths to load helpers from
+	 *
+	 * @var array
+	 * @access protected
+	 */
 	protected $_ci_helper_paths		= array();
+	/**
+	 * List of loaded base classes
+	 * Set by the controller class
+	 *
+	 * @var array
+	 * @access protected
+	 */
 	protected $_base_classes		= array(); // Set by the controller class
+	/**
+	 * List of cached variables
+	 *
+	 * @var array
+	 * @access protected
+	 */
 	protected $_ci_cached_vars		= array();
+	/**
+	 * List of loaded classes
+	 *
+	 * @var array
+	 * @access protected
+	 */
 	protected $_ci_classes			= array();
+	/**
+	 * List of loaded files
+	 *
+	 * @var array
+	 * @access protected
+	 */
 	protected $_ci_loaded_files		= array();
+	/**
+	 * List of loaded models
+	 *
+	 * @var array
+	 * @access protected
+	 */
 	protected $_ci_models			= array();
+	/**
+	 * List of loaded helpers
+	 *
+	 * @var array
+	 * @access protected
+	 */
 	protected $_ci_helpers			= array();
-	protected $_ci_varmap			= array('unit_test' => 'unit', 
+	/**
+	 * List of class name mappings
+	 *
+	 * @var array
+	 * @access protected
+	 */
+	protected $_ci_varmap			= array('unit_test' => 'unit',
 											'user_agent' => 'agent');
 
 	/**
@@ -55,24 +128,29 @@ class CI_Loader {
 		$this->_ci_helper_paths = array(APPPATH, BASEPATH);
 		$this->_ci_model_paths = array(APPPATH);
 		$this->_ci_view_paths = array(APPPATH.'views/'	=> TRUE);
-		
+
 		log_message('debug', "Loader Class Initialized");
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
-	 * Set _base_classes variable
+	 * Initialize the Loader
 	 *
 	 * This method is called once in CI_Controller.
 	 *
-	 * @param 	array 	
+	 * @param 	array
 	 * @return 	object
 	 */
-	public function set_base_classes()
+	public function initialize()
 	{
+		$this->_ci_classes = array();
+		$this->_ci_loaded_files = array();
+		$this->_ci_models = array();
 		$this->_base_classes =& is_loaded();
-		
+
+		$this->_ci_autoloader();
+
 		return $this;
 	}
 
@@ -96,7 +174,7 @@ class CI_Loader {
 		{
 			return $this->_ci_classes[$class];
 		}
-				
+
 		return FALSE;
 	}
 
@@ -366,6 +444,7 @@ class CI_Loader {
 	 * the controller class and its "view" files.
 	 *
 	 * @param	array
+	 * @param 	string
 	 * @return	void
 	 */
 	public function vars($vars = array(), $val = '')
@@ -507,6 +586,8 @@ class CI_Loader {
 	 * Loads a config file
 	 *
 	 * @param	string
+	 * @param	bool
+	 * @param 	bool
 	 * @return	void
 	 */
 	public function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE)
@@ -535,6 +616,11 @@ class CI_Loader {
 			require BASEPATH.'libraries/Driver.php';
 		}
 
+		if ($library == '')
+		{
+			return FALSE;
+		}
+
 		// We can save the loader some time since Drivers will *always* be in a subfolder,
 		// and typically identically named to the library
 		if ( ! strpos($library, '/'))
@@ -553,13 +639,13 @@ class CI_Loader {
 	 * Prepends a parent path to the library, model, helper, and config path arrays
 	 *
 	 * @param	string
-	 * @param 	boolean 	
+	 * @param 	boolean
 	 * @return	void
 	 */
 	public function add_package_path($path, $view_cascade=TRUE)
 	{
 		$path = rtrim($path, '/').'/';
-		
+
 		array_unshift($this->_ci_library_paths, $path);
 		array_unshift($this->_ci_model_paths, $path);
 		array_unshift($this->_ci_helper_paths, $path);
@@ -595,6 +681,7 @@ class CI_Loader {
 	 * If no path is provided, the most recently added path is removed.
 	 *
 	 * @param	type
+	 * @param 	bool
 	 * @return	type
 	 */
 	public function remove_package_path($path = '', $remove_config_path = TRUE)
@@ -619,7 +706,7 @@ class CI_Loader {
 					unset($this->{$var}[$key]);
 				}
 			}
-			
+
 			if (isset($this->_ci_view_paths[$path.'views/']))
 			{
 				unset($this->_ci_view_paths[$path.'views/']);
@@ -658,7 +745,7 @@ class CI_Loader {
 		{
 			$$_ci_val = ( ! isset($_ci_data[$_ci_val])) ? FALSE : $_ci_data[$_ci_val];
 		}
-		
+
 		$file_exists = FALSE;
 
 		// Set the path to the requested file
@@ -680,11 +767,11 @@ class CI_Loader {
 					$file_exists = TRUE;
 					break;
 				}
-				
+
 				if ( ! $cascade)
 				{
 					break;
-				}				
+				}
 			}
 		}
 
@@ -913,6 +1000,7 @@ class CI_Loader {
 	 *
 	 * @param	string
 	 * @param	string
+	 * @param	bool
 	 * @param	string	an optional object name
 	 * @return	null
 	 */
@@ -935,22 +1023,22 @@ class CI_Loader {
 					// first, global next
 					if (defined('ENVIRONMENT') AND file_exists($path .'config/'.ENVIRONMENT.'/'.strtolower($class).'.php'))
 					{
-						include_once($path .'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
+						include($path .'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
 						break;
 					}
 					elseif (defined('ENVIRONMENT') AND file_exists($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
 					{
-						include_once($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
+						include($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
 						break;
 					}
 					elseif (file_exists($path .'config/'.strtolower($class).'.php'))
 					{
-						include_once($path .'config/'.strtolower($class).'.php');
+						include($path .'config/'.strtolower($class).'.php');
 						break;
 					}
 					elseif (file_exists($path .'config/'.ucfirst(strtolower($class)).'.php'))
 					{
-						include_once($path .'config/'.ucfirst(strtolower($class)).'.php');
+						include($path .'config/'.ucfirst(strtolower($class)).'.php');
 						break;
 					}
 				}
@@ -1020,23 +1108,19 @@ class CI_Loader {
 	 * The config/autoload.php file contains an array that permits sub-systems,
 	 * libraries, and helpers to be loaded automatically.
 	 *
-	 * This function is public, as it's used in the CI_Controller class.  
-	 * However, there is no reason you should ever needs to use it.
-	 *
 	 * @param	array
 	 * @return	void
 	 */
-	public function ci_autoloader()
+	private function _ci_autoloader()
 	{
 		if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload.php'))
 		{
-			include_once(APPPATH.'config/'.ENVIRONMENT.'/autoload.php');
+			include(APPPATH.'config/'.ENVIRONMENT.'/autoload.php');
 		}
 		else
 		{
-			include_once(APPPATH.'config/autoload.php');
+			include(APPPATH.'config/autoload.php');
 		}
-		
 
 		if ( ! isset($autoload))
 		{
@@ -1122,6 +1206,7 @@ class CI_Loader {
 	/**
 	 * Get a reference to a specific library or model
 	 *
+	 * @param 	string
 	 * @return	bool
 	 */
 	protected function &_ci_get_component($component)
@@ -1138,6 +1223,7 @@ class CI_Loader {
 	 * This function preps the name of various items to make loading them more reliable.
 	 *
 	 * @param	mixed
+	 * @param 	string
 	 * @return	array
 	 */
 	protected function _ci_prep_filename($filename, $extension)