diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-01-16 16:15:31 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-01-16 16:15:31 +0100 |
| commit | 19b6ea8cf748034c041f88370bac620924fe1d7b (patch) | |
| tree | 83fc9d93e6ea24db857a0aaf6e8948cbd4982ca9 /phpBB/includes/functions_database_helper.php | |
| parent | 37014abd022be4f7824a590b93a329f74aef442c (diff) | |
| parent | f63e115ae90edb9d65bc3bb23fc4d3c0ce81b763 (diff) | |
| download | forums-19b6ea8cf748034c041f88370bac620924fe1d7b.tar forums-19b6ea8cf748034c041f88370bac620924fe1d7b.tar.gz forums-19b6ea8cf748034c041f88370bac620924fe1d7b.tar.bz2 forums-19b6ea8cf748034c041f88370bac620924fe1d7b.tar.xz forums-19b6ea8cf748034c041f88370bac620924fe1d7b.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (205 commits)
[ticket/10786] Javascript toggle member search panel in memberlist.php
[ticket/10786] Javascript toggle member search panel in memberlist.php
[ticket/10786] Javascript toggle member search panel in memberlist.php
[ticket/11201] Remove database column on update
[ticket/10431] Remove .left class from reply-all
[ticket/10431] Remove reply-all custom css
[ticket/10431] Adjustments for large buttons
[ticket/11323] Add tests for inclusion of defined variables
[ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
[ticket/11201] Remove MSN/WLM fields
[ticket/11321] Recreate schema files with develop/create_schema_files.php
[ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31
[ticket/11313] Use correct object el instead of eel in alt_text callback
[ticket/11301] Guidelines: Add spaces in front and after the / operator.
[ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
[ticket/11311] Include asset core.js in subsilver2 overall_footer.html
[ticket/10949] Remove not needed comma
[ticket/11309] phpbb_extension_interface::disable_step correct docblock.
[ticket/10949] Converted missing code to new JS coding guidelines
[ticket/11302] Correctly select first timezone or selected timezone
...
Diffstat (limited to 'phpBB/includes/functions_database_helper.php')
| -rw-r--r-- | phpBB/includes/functions_database_helper.php | 8 |
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 |