summaryrefslogtreecommitdiffstats
path: root/system/core/Loader.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2022-01-05 21:25:38 +0100
committerAndrey Andreev <narf@devilix.net>2022-01-05 21:25:38 +0100
commitf85ee8dd6a94529b6974d826b2018cc42dbd17cb (patch)
tree0230efd5848d71e5176c07496b1880f7e3fc8057 /system/core/Loader.php
parent004f0a1b41c27e3d40f62a51300599d35c54c0c0 (diff)
Drop option to disable Query Builder
I don't know if it has ever worked properly, too much things break if you do try to disable it.
Diffstat (limited to 'system/core/Loader.php')
-rw-r--r--system/core/Loader.php11
1 files changed, 4 insertions, 7 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index de08615f3..aea1d82ed 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -375,19 +375,16 @@ class CI_Loader {
*
* @param mixed $params Database configuration options
* @param bool $return Whether to return the database object
- * @param bool $query_builder Whether to enable Query Builder
- * (overrides the configuration setting)
- *
* @return object|bool Database object if $return is set to TRUE,
* FALSE on failure, CI_Loader instance in any other case
*/
- public function database($params = '', $return = FALSE, $query_builder = NULL)
+ public function database($params = '', $return = FALSE)
{
// Grab the super object
$CI =& get_instance();
// Do we even need to load the database class?
- if ($return === FALSE && $query_builder === NULL && isset($CI->db) && is_object($CI->db) && ! empty($CI->db->conn_id))
+ if ($return === FALSE && isset($CI->db) && is_object($CI->db) && ! empty($CI->db->conn_id))
{
return FALSE;
}
@@ -396,7 +393,7 @@ class CI_Loader {
if ($return === TRUE)
{
- return DB($params, $query_builder);
+ return DB($params);
}
// Initialize the db variable. Needed to prevent
@@ -404,7 +401,7 @@ class CI_Loader {
$CI->db = '';
// Load the DB class
- $CI->db =& DB($params, $query_builder);
+ $CI->db =& DB($params);
return $this;
}