diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-10-24 13:55:35 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-10-24 13:55:35 +0200 |
| commit | 5fd3ae8d33a4f5d3159b86683b9a670e973a63f5 (patch) | |
| tree | e9d9b67931545e1059b2e27d532ac81ec5f33133 /system/core | |
| parent | 3639d4798cd1ac26b715d8d74ff7855474fb01d7 (diff) | |
[ci skip] style and phpdoc-related changes (rel #1295)
Diffstat (limited to 'system/core')
| -rw-r--r-- | system/core/Controller.php | 2 | ||||
| -rw-r--r-- | system/core/Loader.php | 4 | ||||
| -rw-r--r-- | system/core/Output.php | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/system/core/Controller.php b/system/core/Controller.php index 491414807..9196958ae 100644 --- a/system/core/Controller.php +++ b/system/core/Controller.php @@ -42,6 +42,7 @@ class CI_Controller { /** * Reference to the global CI instance * + * @static * @var object */ private static $instance; @@ -71,6 +72,7 @@ class CI_Controller { /** * Return the CI object * + * @static * @return object */ public static function &get_instance() diff --git a/system/core/Loader.php b/system/core/Loader.php index 75e93608a..5de2e5dde 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -689,7 +689,7 @@ class CI_Loader { */ public function get_package_paths($include_base = FALSE) { - return $include_base === TRUE ? $this->_ci_library_paths : $this->_ci_model_paths; + return ($include_base === TRUE) ? $this->_ci_library_paths : $this->_ci_model_paths; } // -------------------------------------------------------------------- @@ -1005,7 +1005,7 @@ class CI_Loader { $path = strtolower($class).'/'.$class; return $this->_ci_load_class($path, $params, $object_name); } - else if (ucfirst($subdir) != $subdir) + elseif (ucfirst($subdir) != $subdir) { // Lowercase subdir failed - retry capitalized $path = ucfirst($subdir).$class; diff --git a/system/core/Output.php b/system/core/Output.php index 052367ed6..aa0e05dc4 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -204,7 +204,8 @@ class CI_Output { /** * Set Content Type Header * - * @param string extension of the file we're outputting + * @param string $mime_type extension of the file we're outputting + * @param string $charset = NULL * @return void */ public function set_content_type($mime_type, $charset = NULL) |