Changing all class constructors to __construct()
diff --git a/system/core/Config.php b/system/core/Config.php
index b7055c6..bdd1b83 100644
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -43,7 +43,7 @@
* @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
*/
- function CI_Config()
+ function __construct()
{
$this->config =& get_config();
log_message('debug', "Config Class Initialized");
diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php
index 26b24ef..32cb77b 100644
--- a/system/core/Exceptions.php
+++ b/system/core/Exceptions.php
@@ -50,9 +50,8 @@
/**
* Constructor
- *
*/
- function CI_Exceptions()
+ public function __construct()
{
$this->ob_level = ob_get_level();
// Note: Do not log messages from this constructor.
diff --git a/system/core/Hooks.php b/system/core/Hooks.php
index 3f84194..70dc687 100644
--- a/system/core/Hooks.php
+++ b/system/core/Hooks.php
@@ -36,7 +36,7 @@
* Constructor
*
*/
- function CI_Hooks()
+ function __construct()
{
$this->_initialize();
log_message('debug', "Hooks Class Initialized");
diff --git a/system/core/Input.php b/system/core/Input.php
index f959b28..0ce2d89 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -35,16 +35,14 @@
var $_enable_xss = FALSE; // Set automatically based on config setting
var $_enable_csrf = FALSE; // Set automatically based on config setting
-
/**
- * Constructor
- *
- * Sets whether to globally enable the XSS processing
- * and whether to allow the $_GET array
- *
- * @access public
- */
- function CI_Input()
+ * Constructor
+ *
+ * Sets whether to globally enable the XSS processing
+ * and whether to allow the $_GET array
+ *
+ */
+ public function __construct()
{
log_message('debug', "Input Class Initialized");
@@ -72,16 +70,16 @@
// --------------------------------------------------------------------
/**
- * Fetch from array
- *
- * This is a helper function to retrieve values from global arrays
- *
- * @access private
- * @param array
- * @param string
- * @param bool
- * @return string
- */
+ * Fetch from array
+ *
+ * This is a helper function to retrieve values from global arrays
+ *
+ * @access private
+ * @param array
+ * @param string
+ * @param bool
+ * @return string
+ */
function _fetch_from_array(&$array, $index = '', $xss_clean = FALSE)
{
if ( ! isset($array[$index]))
diff --git a/system/core/Lang.php b/system/core/Lang.php
index a53a202..e7867b3 100644
--- a/system/core/Lang.php
+++ b/system/core/Lang.php
@@ -34,7 +34,7 @@
*
* @access public
*/
- function CI_Lang()
+ function __construct()
{
log_message('debug', "Language Class Initialized");
}
diff --git a/system/core/Loader.php b/system/core/Loader.php
index b64a6e6..5d4b259 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -50,7 +50,7 @@
*
* @access public
*/
- function CI_Loader()
+ function __construct()
{
$this->_ci_view_path = APPPATH.'views/';
$this->_ci_ob_level = ob_get_level();
diff --git a/system/core/Output.php b/system/core/Output.php
index 2ded283..27a3a4b 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -37,7 +37,7 @@
var $_zlib_oc = FALSE;
var $_profiler_sections = array();
- function CI_Output()
+ function __construct()
{
$this->_zlib_oc = @ini_get('zlib.output_compression');
diff --git a/system/core/Router.php b/system/core/Router.php
index 06c8d48..9276800 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -41,7 +41,7 @@
*
* Runs the route mapping function.
*/
- function CI_Router()
+ function __construct()
{
$this->config =& load_class('Config', 'core');
$this->uri =& load_class('URI', 'core');
diff --git a/system/core/URI.php b/system/core/URI.php
index b8d48c5..b36593b 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -28,7 +28,7 @@
*/
class CI_URI {
- var $keyval = array();
+ var $keyval = array();
var $uri_string;
var $segments = array();
var $rsegments = array();
@@ -42,7 +42,7 @@
*
* @access public
*/
- function CI_URI()
+ function __construct()
{
$this->config =& load_class('Config', 'core');
log_message('debug', "URI Class Initialized");
diff --git a/system/core/Unicode.php b/system/core/Unicode.php
index 20605ee..ce1de30 100644
--- a/system/core/Unicode.php
+++ b/system/core/Unicode.php
@@ -34,7 +34,7 @@
* Determines if UTF-8 support is to be enabled
*
*/
- function CI_Unicode()
+ function __construct()
{
log_message('debug', "Unicode Class Initialized");