From 0acf65a39272ec5599c740cef1fd7ce6c690c998 Mon Sep 17 00:00:00 2001 From: Zac Wasielewski Date: Fri, 15 Jul 2011 22:23:18 -0400 Subject: Fixed missing table prefixes in Database Forge Class rename_table() method --- system/database/DB_forge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index a71fca78f..0dd29c238 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -234,7 +234,7 @@ class CI_DB_forge { show_error('A table name is required for that operation.'); } - $sql = $this->_rename_table($table_name, $new_table_name); + $sql = $this->_rename_table($this->db->dbprefix.$table_name, $this->db->dbprefix.$new_table_name); return $this->db->query($sql); } -- cgit v1.2.3-24-g4f1b From 83e7a8ed2536aca790a83e8c533dcdc150e6a79b Mon Sep 17 00:00:00 2001 From: root Date: Sun, 14 Aug 2011 19:55:57 +0200 Subject: Added some docs to CI core files --- system/core/Benchmark.php | 5 +++++ system/core/CodeIgniter.php | 13 +++++++++++++ 2 files changed, 18 insertions(+) mode change 100644 => 100755 system/core/Benchmark.php mode change 100644 => 100755 system/core/CodeIgniter.php diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php old mode 100644 new mode 100755 index 515550e9f..a200727ab --- 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 old mode 100644 new mode 100755 index 03b25ab9e..4eb918b15 --- 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); /* -- cgit v1.2.3-24-g4f1b From 2d2c9c6be50c246463ec08ad7d152b3da9708c61 Mon Sep 17 00:00:00 2001 From: David Behler Date: Sun, 14 Aug 2011 20:03:08 +0200 Subject: Added some docs to CI core files --- system/core/Config.php | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) mode change 100644 => 100755 system/core/Config.php diff --git a/system/core/Config.php b/system/core/Config.php old mode 100644 new mode 100755 index 0e6f10e07..714c4667b --- 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 * -- cgit v1.2.3-24-g4f1b