aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-12-15 10:48:06 -0600
committerNathan Guse <nathaniel.guse@gmail.com>2012-12-15 10:48:06 -0600
commitb6778802b3784da34db4890eabd6c64100a385fc (patch)
treed5e75614725948ca4dbf355c77b7ddc7c99451c4
parent762cb074c330480340a6c14abb37e82a1ff8b09d (diff)
parent5e38317dcf28627abbb622d0412cc6cc3416071b (diff)
downloadforums-b6778802b3784da34db4890eabd6c64100a385fc.tar
forums-b6778802b3784da34db4890eabd6c64100a385fc.tar.gz
forums-b6778802b3784da34db4890eabd6c64100a385fc.tar.bz2
forums-b6778802b3784da34db4890eabd6c64100a385fc.tar.xz
forums-b6778802b3784da34db4890eabd6c64100a385fc.zip
Merge remote-tracking branch 'remotes/Oleg/ticket/11162' into develop
# By Oleg Pudeyev # Via Oleg Pudeyev * remotes/Oleg/ticket/11162: [ticket/11162] Chase dbal autoloading changes in develop.
-rw-r--r--phpBB/includes/functions_database_helper.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_database_helper.php b/phpBB/includes/functions_database_helper.php
index 664c246888..1b508e6a02 100644
--- a/phpBB/includes/functions_database_helper.php
+++ b/phpBB/includes/functions_database_helper.php
@@ -22,14 +22,14 @@ if (!defined('IN_PHPBB'))
*
* The only supported table is bookmarks.
*
-* @param dbal $db Database object
+* @param phpbb_db_driver $db Database object
* @param string $table Table on which to perform the update
* @param string $column Column whose values to change
* @param array $from_values An array of values that should be changed
* @param int $to_value The new value
* @return null
*/
-function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_values, $to_value)
+function phpbb_update_rows_avoiding_duplicates(phpbb_db_driver $db, $table, $column, $from_values, $to_value)
{
$sql = "SELECT $column, user_id
FROM $table
@@ -107,14 +107,14 @@ function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_value
*
* The only supported table is topics_watch.
*
-* @param dbal $db Database object
+* @param phpbb_db_driver $db Database object
* @param string $table Table on which to perform the update
* @param string $column Column whose values to change
* @param array $from_values An array of values that should be changed
* @param int $to_value The new value
* @return null
*/
-function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $column, $from_values, $to_value)
+function phpbb_update_rows_avoiding_duplicates_notify_status(phpbb_db_driver $db, $table, $column, $from_values, $to_value)
{
$sql = "SELECT $column, user_id, notify_status
FROM $table