Skip to content

fix: Remove the leftover $query_builder argument and docs from the Loader. #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pocketarc merged 1 commit into from
Nov 1, 2026
Merged

fix: Remove the leftover $query_builder argument and docs from the Loader. #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion system/core/Loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ public function model($model, $name = '', $db_conn = FALSE)
$db_conn = '';
}

$this->database($db_conn, FALSE, TRUE);
$this->database($db_conn);
}

// Note: All of the code under this condition used to be just:
Expand Down
3 changes: 1 addition & 2 deletions user_guide_src/source/libraries/loader.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,11 +317,10 @@ Class Reference
$this->load->model('model_name', 'fubar');
$this->fubar->method();

.. php:method:: database([$params = ''[, $return = FALSE[, $query_builder = NULL]]])
.. php:method:: database([$params = ''[, $return = FALSE]])

:param mixed $params: Database group name or configuration options
:param bool $return: Whether to return the loaded database object
:param bool $query_builder: Whether to load the Query Builder
:returns: Loaded CI_DB instance or FALSE on failure if $return is set to TRUE, otherwise CI_Loader instance (method chaining)
:rtype: mixed

Expand Down