summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/database/DB.php4
-rw-r--r--system/database/drivers/mssql/mssql_utility.php2
-rw-r--r--system/database/drivers/oci8/oci8_utility.php2
-rw-r--r--system/database/drivers/sqlite/sqlite_utility.php2
-rw-r--r--system/libraries/Loader.php5
-rw-r--r--system/libraries/Router.php2
6 files changed, 8 insertions, 9 deletions
diff --git a/system/database/DB.php b/system/database/DB.php
index a148c9ffe..d2afce982 100644
--- a/system/database/DB.php
+++ b/system/database/DB.php
@@ -22,7 +22,7 @@
* @author Rick Ellis
* @link http://www.codeigniter.com/user_guide/database/
*/
-function DB($params = '', $active_record = FALSE)
+function &DB($params = '', $active_record = FALSE)
{
// Load the DB config file if a DSN string wasn't passed
if (is_string($params) AND strpos($params, '://') === FALSE)
@@ -78,7 +78,7 @@ function DB($params = '', $active_record = FALSE)
// Instantiate the DB adapter
$driver = 'CI_DB_'.$params['dbdriver'].'_driver';
- $DB = new $driver($params);
+ $DB =& new $driver($params);
return $DB;
}
diff --git a/system/database/drivers/mssql/mssql_utility.php b/system/database/drivers/mssql/mssql_utility.php
index 129ba6861..24ff1e13c 100644
--- a/system/database/drivers/mssql/mssql_utility.php
+++ b/system/database/drivers/mssql/mssql_utility.php
@@ -106,7 +106,7 @@ class CI_DB_mssql_utility extends CI_DB_utility {
*/
function _repair_table($table)
{
- return return FALSE; // Is this supported in MS SQL?
+ return FALSE; // Is this supported in MS SQL?
}
// --------------------------------------------------------------------
diff --git a/system/database/drivers/oci8/oci8_utility.php b/system/database/drivers/oci8/oci8_utility.php
index 96be09506..f4e912183 100644
--- a/system/database/drivers/oci8/oci8_utility.php
+++ b/system/database/drivers/oci8/oci8_utility.php
@@ -106,7 +106,7 @@ class CI_DB_oci8_utility extends CI_DB_utility {
*/
function _repair_table($table)
{
- return return FALSE; // Is this supported in Oracle?
+ return FALSE; // Is this supported in Oracle?
}
// --------------------------------------------------------------------
diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php
index 9cb2cf027..ecce5be40 100644
--- a/system/database/drivers/sqlite/sqlite_utility.php
+++ b/system/database/drivers/sqlite/sqlite_utility.php
@@ -131,7 +131,7 @@ class CI_DB_sqlite_utility extends CI_DB_utility {
*/
function _repair_table($table)
{
- return return FALSE;
+ return FALSE;
}
// --------------------------------------------------------------------
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 7bf11609b..b402464e2 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -703,9 +703,8 @@ class CI_Loader {
function _ci_init_class($class, $prefix = '', $config = NULL)
{
// Is there an associated config file for this class?
- if ($config !== NULL)
- {
- $config = NULL;
+ if ($config === NULL)
+ {
if (file_exists(APPPATH.'config/'.$class.EXT))
{
include_once(APPPATH.'config/'.$class.EXT);
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index bbfa0d192..06037209b 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -373,7 +373,7 @@ class CI_Router {
$request_uri = preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $_SERVER['REQUEST_URI']));
- if ($request_uri == '' OR $request_uri == SELF)
+ if ($request_uri == '' OR $request_uri == $this->config->item('index_page'))
{
return '';
}