summaryrefslogtreecommitdiffstats
path: root/system/core/Loader.php
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-05-17 14:53:07 +0200
committerTimothy Warren <tim@timshomepage.net>2012-05-17 14:53:07 +0200
commit0ab28ced4d4f20d5857fae9ec0e20452d4ac181b (patch)
treefae554725bd9b187f9b298e5702f951ac394a6d7 /system/core/Loader.php
parentd013c63462b4eaa2ac2f684b2ad498a9c4fb7dd5 (diff)
parente30b3f7afafa2c016cf78cc8bb8a457c2dbcda8c (diff)
merge upstream
Diffstat (limited to 'system/core/Loader.php')
-rw-r--r--system/core/Loader.php35
1 files changed, 16 insertions, 19 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index bf7f6cb02..3eb09e6ab 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -32,8 +32,8 @@
*
* @package CodeIgniter
* @subpackage Libraries
- * @author EllisLab Dev Team
* @category Loader
+ * @author EllisLab Dev Team
* @link http://codeigniter.com/user_guide/libraries/loader.html
*/
class CI_Loader {
@@ -45,77 +45,77 @@ class CI_Loader {
* @var int
*/
protected $_ci_ob_level;
-
+
/**
* List of paths to load views from
*
* @var array
*/
protected $_ci_view_paths = array();
-
+
/**
* List of paths to load libraries from
*
* @var array
*/
protected $_ci_library_paths = array();
-
+
/**
* List of paths to load models from
*
* @var array
*/
protected $_ci_model_paths = array();
-
+
/**
* List of paths to load helpers from
*
* @var array
*/
protected $_ci_helper_paths = array();
-
+
/**
* List of loaded base classes
*
* @var array
*/
protected $_base_classes = array(); // Set by the controller class
-
+
/**
* List of cached variables
*
* @var array
*/
protected $_ci_cached_vars = array();
-
+
/**
* List of loaded classes
*
* @var array
*/
protected $_ci_classes = array();
-
+
/**
* List of loaded files
*
* @var array
*/
protected $_ci_loaded_files = array();
-
+
/**
* List of loaded models
*
* @var array
*/
protected $_ci_models = array();
-
+
/**
* List of loaded helpers
*
* @var array
*/
protected $_ci_helpers = array();
-
+
/**
* List of class name mappings
*
@@ -130,6 +130,8 @@ class CI_Loader {
* Constructor
*
* Sets the path to the view files and gets the initial output buffering level
+ *
+ * @return void
*/
public function __construct()
{
@@ -178,12 +180,7 @@ class CI_Loader {
*/
public function is_loaded($class)
{
- if (isset($this->_ci_classes[$class]))
- {
- return $this->_ci_classes[$class];
- }
-
- return FALSE;
+ return isset($this->_ci_classes[$class]) ? $this->_ci_classes[$class] : FALSE;
}
// --------------------------------------------------------------------
@@ -1263,4 +1260,4 @@ class CI_Loader {
}
/* End of file Loader.php */
-/* Location: ./system/core/Loader.php */
+/* Location: ./system/core/Loader.php */ \ No newline at end of file