summaryrefslogtreecommitdiffstats
path: root/system/core/Config.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-05-02 11:47:42 +0200
committerAndrey Andreev <narf@bofh.bg>2012-05-02 11:47:42 +0200
commitbd738c80a623700b3b11e876abb764ca6d57769d (patch)
tree7ceec96d9dc36bb524acff0946e9eb0db03f90d0 /system/core/Config.php
parent721c77fcf347751895623514fb2e4c89390afa67 (diff)
parent02b80cbe5aae7e474b097c149ab6479de9ab0f91 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-odbc
Diffstat (limited to 'system/core/Config.php')
-rwxr-xr-xsystem/core/Config.php7
1 files changed, 0 insertions, 7 deletions
diff --git a/system/core/Config.php b/system/core/Config.php
index 1eab08b82..9cebe6c86 100755
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -66,11 +66,6 @@ class CI_Config {
* Constructor
*
* Sets the $config data from the primary config.php file as a class variable
- *
- * @param string the config file name
- * @param boolean if configuration values should be loaded into their own section
- * @param boolean true if errors should just return false, false if an error message should be displayed
- * @return boolean if the file was successfully loaded or not
*/
public function __construct()
{
@@ -192,7 +187,6 @@ class CI_Config {
*
* @param string the config item name
* @param string the index name
- * @param bool
* @return string
*/
public function item($item, $index = '')
@@ -211,7 +205,6 @@ class CI_Config {
* Fetch a config file item - adds slash after item (if item is not empty)
*
* @param string the config item name
- * @param bool
* @return string
*/
public function slash_item($item)