diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-10-04 14:39:21 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-10-04 14:39:21 +0200 |
| commit | 0f614c692eb2db49da98b8eca6247bd8c245a64e (patch) | |
| tree | 34d840f8a3dc866a6239c533e441e6df69227c51 | |
| parent | bb2e2ed4ac4200c12dae08018e932c65256e8701 (diff) | |
| parent | 1244d84855325ad94e2563f23574259840cb85b0 (diff) | |
Merge pull request #513 from freewil/core-cleanup
cleanup docblocks, remove dated CI_CORE constant
| -rwxr-xr-x | system/core/CodeIgniter.php | 20 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 1 insertions, 20 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index aca4fb23c..9f88384b1 100755 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -33,28 +33,8 @@ * @var string * */ - /** - * CodeIgniter Version - * - * @var string - * - */ define('CI_VERSION', '2.1.0-dev'); -/** - * CodeIgniter Branch (Core = TRUE, Reactor = FALSE) - * - * @var boolean - * - */ - /** - * CodeIgniter Branch (Core = TRUE, Reactor = FALSE) - * - * @var string - * - */ - define('CI_CORE', FALSE); - /* * ------------------------------------------------------ * Load the global functions diff --git a/user_guide/changelog.html b/user_guide/changelog.html index fef05f78e..c652cc87c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -112,6 +112,7 @@ Change Log <li>Core <ul> <li>Changed private functions in CI_URI to protected so MY_URI can override them.</li> + <li>Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions).</li> </ul> </li> </ul> |