diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-23 15:05:47 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-23 15:05:47 -0600 |
| commit | 213bc09743a0d326e2379f3f12bfd549499031b4 (patch) | |
| tree | 73458c54dd199e1f70631d21c5bfa866a900d5ca /phpBB/includes/db/db_tools.php | |
| parent | a665ad5c2e44922fbd9790597913091c68311533 (diff) | |
| parent | 6e1e62a77daf77ec3dd4fc131ffbb1a099936ef4 (diff) | |
| download | forums-213bc09743a0d326e2379f3f12bfd549499031b4.tar forums-213bc09743a0d326e2379f3f12bfd549499031b4.tar.gz forums-213bc09743a0d326e2379f3f12bfd549499031b4.tar.bz2 forums-213bc09743a0d326e2379f3f12bfd549499031b4.tar.xz forums-213bc09743a0d326e2379f3f12bfd549499031b4.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/migrations-data
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/includes/db/db_tools.php')
| -rw-r--r-- | phpBB/includes/db/db_tools.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php index e8c26fa502..983cdc18ea 100644 --- a/phpBB/includes/db/db_tools.php +++ b/phpBB/includes/db/db_tools.php @@ -303,7 +303,7 @@ class phpbb_db_tools * @param phpbb_db_driver $db Database connection * @param bool $return_statements True if only statements should be returned and no SQL being executed */ - function phpbb_db_tools(&$db, $return_statements = false) + function phpbb_db_tools(phpbb_db_driver $db, $return_statements = false) { $this->db = $db; $this->return_statements = $return_statements; |