aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db/db_tools.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2012-12-24 14:34:10 +0100
committerMarc Alexander <admin@m-a-styles.de>2012-12-24 14:34:10 +0100
commitc9338b38b35675bd1d620e4a8ca7d44a522faace (patch)
tree0746db7f0eb5f22780c04e3ece5fb6a549045860 /phpBB/includes/db/db_tools.php
parente6aaef6066549696453063417167e5a79c53b353 (diff)
parent46b3c3ecc43721e53c9711a196e91c300e03a1c8 (diff)
downloadforums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar
forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar.gz
forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar.bz2
forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar.xz
forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.zip
Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatars
Diffstat (limited to 'phpBB/includes/db/db_tools.php')
-rw-r--r--phpBB/includes/db/db_tools.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 6df3aac9ce..2bb016cebd 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -300,7 +300,7 @@ class phpbb_db_tools
/**
* Constructor. Set DB Object and set {@link $return_statements return_statements}.
*
- * @param phpbb_dbal $db DBAL object
+ * @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)