diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-15 19:18:47 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-15 19:18:47 -0600 |
| commit | 1cfcbfd19f2bdb8d3248e8dc0bc88f09cbeb82d3 (patch) | |
| tree | b2e82e4fcb65b1beca1bd9017de395ec2df903de /phpBB | |
| parent | f47e51d6dea9d59a36a6babf1f4033104c93a53d (diff) | |
| parent | 0f35f94398dbb8b64d420dc8ebcdea760cade113 (diff) | |
| download | forums-1cfcbfd19f2bdb8d3248e8dc0bc88f09cbeb82d3.tar forums-1cfcbfd19f2bdb8d3248e8dc0bc88f09cbeb82d3.tar.gz forums-1cfcbfd19f2bdb8d3248e8dc0bc88f09cbeb82d3.tar.bz2 forums-1cfcbfd19f2bdb8d3248e8dc0bc88f09cbeb82d3.tar.xz forums-1cfcbfd19f2bdb8d3248e8dc0bc88f09cbeb82d3.zip | |
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Andreas Fischer (1) and Oleg Pudeyev (1)
# Via Nathan Guse (2) and Andreas Fischer (1)
* 'develop' of github.com:phpbb/phpbb3:
[ticket/11273] Add space before MiB to Sphinx "Indexer memory limit" input box.
[ticket/11162] Chase dbal autoloading changes in develop.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_database_helper.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/search/fulltext_sphinx.php | 2 |
2 files changed, 5 insertions, 5 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 diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php index a84a64825c..4bacf74f93 100644 --- a/phpBB/includes/search/fulltext_sphinx.php +++ b/phpBB/includes/search/fulltext_sphinx.php @@ -875,7 +875,7 @@ class phpbb_search_fulltext_sphinx </dl> <dl> <dt><label for="fulltext_sphinx_indexer_mem_limit">' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'] . '</span></dt> - <dd><input id="fulltext_sphinx_indexer_mem_limit" type="text" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" />' . $this->user->lang['MIB'] . '</dd> + <dd><input id="fulltext_sphinx_indexer_mem_limit" type="text" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" /> ' . $this->user->lang['MIB'] . '</dd> </dl> <dl> <dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</dt> |