Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/migrations-extensions

# Via Igor Wiedler (1) and Nathaniel Guse (1)
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
This commit is contained in:
Nathaniel Guse 2013-02-09 19:51:18 -06:00
commit ec9328e943

View file

@ -303,7 +303,7 @@ class phpbb_db_tools
* @param phpbb_db_driver $db Database connection * @param phpbb_db_driver $db Database connection
* @param bool $return_statements True if only statements should be returned and no SQL being executed * @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->db = $db;
$this->return_statements = $return_statements; $this->return_statements = $return_statements;