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.
This commit is contained in:
Nathan Guse 2012-12-15 10:48:06 -06:00
commit b6778802b3

View file

@ -22,14 +22,14 @@ if (!defined('IN_PHPBB'))
* *
* The only supported table is bookmarks. * 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 $table Table on which to perform the update
* @param string $column Column whose values to change * @param string $column Column whose values to change
* @param array $from_values An array of values that should be changed * @param array $from_values An array of values that should be changed
* @param int $to_value The new value * @param int $to_value The new value
* @return null * @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 $sql = "SELECT $column, user_id
FROM $table FROM $table
@ -107,14 +107,14 @@ function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_value
* *
* The only supported table is topics_watch. * 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 $table Table on which to perform the update
* @param string $column Column whose values to change * @param string $column Column whose values to change
* @param array $from_values An array of values that should be changed * @param array $from_values An array of values that should be changed
* @param int $to_value The new value * @param int $to_value The new value
* @return null * @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 $sql = "SELECT $column, user_id, notify_status
FROM $table FROM $table