summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-14 20:08:00 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-14 20:08:00 +0200
commitc2a37669107829b032b08562e784416713f569b1 (patch)
treeaa1525f1a23485a91d7281b1e38c3a4f6bf5860e
parent254217a8655a14716bb673a0abde81c0b80ccd90 (diff)
parent2d2c9c6be50c246463ec08ad7d152b3da9708c61 (diff)
Merge pull request #46 from waldmeister/master
Added some docs to CI core files
-rwxr-xr-x[-rw-r--r--]system/core/Benchmark.php5
-rwxr-xr-x[-rw-r--r--]system/core/CodeIgniter.php13
-rwxr-xr-x[-rw-r--r--]system/core/Config.php29
3 files changed, 40 insertions, 7 deletions
diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php
index 515550e9f..a200727ab 100644..100755
--- a/system/core/Benchmark.php
+++ b/system/core/Benchmark.php
@@ -29,6 +29,11 @@
*/
class CI_Benchmark {
+ /**
+ * List of all benchmark markers and when they were added
+ *
+ * @var array
+ */
var $marker = array();
// --------------------------------------------------------------------
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 03b25ab9e..4eb918b15 100644..100755
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -32,6 +32,12 @@
* Define the CodeIgniter Version
* ------------------------------------------------------
*/
+ /**
+ * CodeIgniter Version
+ *
+ * @var string
+ *
+ */
define('CI_VERSION', '2.0.2');
/*
@@ -39,6 +45,13 @@
* Define the CodeIgniter Branch (Core = TRUE, Reactor = FALSE)
* ------------------------------------------------------
*/
+
+ /**
+ * CodeIgniter Branch (Core = TRUE, Reactor = FALSE)
+ *
+ * @var string
+ *
+ */
define('CI_CORE', FALSE);
/*
diff --git a/system/core/Config.php b/system/core/Config.php
index 0e6f10e07..714c4667b 100644..100755
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -28,8 +28,23 @@
*/
class CI_Config {
+ /**
+ * List of all loaded config values
+ *
+ * @var array
+ */
var $config = array();
+ /**
+ * List of all loaded config files
+ *
+ * @var array
+ */
var $is_loaded = array();
+ /**
+ * List of paths to search when trying to load a config file
+ *
+ * @var array
+ */
var $_config_paths = array(APPPATH);
/**
@@ -251,13 +266,13 @@ class CI_Config {
return $this->slash_item('base_url').$this->item('index_page').'?'.$this->_uri_string($uri);
}
}
-
+
// -------------------------------------------------------------
-
+
/**
* Base URL
* Returns base_url [. uri_string]
- *
+ *
* @access public
* @param string $uri
* @return string
@@ -266,12 +281,12 @@ class CI_Config {
{
return $this->slash_item('base_url').ltrim($this->_uri_string($uri),'/');
}
-
+
// -------------------------------------------------------------
-
+
/**
* Build URI string for use in Config::site_url() and Config::base_url()
- *
+ *
* @access protected
* @param $uri
* @return string
@@ -305,7 +320,7 @@ class CI_Config {
}
// --------------------------------------------------------------------
-
+
/**
* System URL
*