diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-01-17 17:55:00 -0800 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-01-17 17:55:00 -0800 |
| commit | 6ae6dceb4785e40a1dc107588896f926612c6554 (patch) | |
| tree | 75ce045a7e43eed1507e9ca6fe87bff099fae69e /phpBB/phpbb | |
| parent | 8eb9f1542cf02209e2991d0abd5cbf876fdec5bf (diff) | |
| parent | b3a25c52e57b31259e71984f320611fc5d6513bb (diff) | |
| download | forums-6ae6dceb4785e40a1dc107588896f926612c6554.tar forums-6ae6dceb4785e40a1dc107588896f926612c6554.tar.gz forums-6ae6dceb4785e40a1dc107588896f926612c6554.tar.bz2 forums-6ae6dceb4785e40a1dc107588896f926612c6554.tar.xz forums-6ae6dceb4785e40a1dc107588896f926612c6554.zip | |
Merge pull request #1950 from prototech/ticket/12096
[ticket/12096] Use plurals for MAX_NUM_SEARCH_KEYWORDS_REFINE.
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/search/fulltext_mysql.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/search/fulltext_native.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php index cdd2da222f..509b73e26e 100644 --- a/phpBB/phpbb/search/fulltext_mysql.php +++ b/phpBB/phpbb/search/fulltext_mysql.php @@ -216,7 +216,7 @@ class fulltext_mysql extends \phpbb\search\base // We limit the number of allowed keywords to minimize load on the database if ($this->config['max_num_search_keywords'] && sizeof($this->split_words) > $this->config['max_num_search_keywords']) { - trigger_error($this->user->lang('MAX_NUM_SEARCH_KEYWORDS_REFINE', $this->config['max_num_search_keywords'], sizeof($this->split_words))); + trigger_error($this->user->lang('MAX_NUM_SEARCH_KEYWORDS_REFINE', (int) $this->config['max_num_search_keywords'], sizeof($this->split_words))); } // to allow phrase search, we need to concatenate quoted words diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php index 1b314a24d3..1a89182978 100644 --- a/phpBB/phpbb/search/fulltext_native.php +++ b/phpBB/phpbb/search/fulltext_native.php @@ -277,7 +277,7 @@ class fulltext_native extends \phpbb\search\base // We limit the number of allowed keywords to minimize load on the database if ($this->config['max_num_search_keywords'] && $num_keywords > $this->config['max_num_search_keywords']) { - trigger_error($this->user->lang('MAX_NUM_SEARCH_KEYWORDS_REFINE', $this->config['max_num_search_keywords'], $num_keywords)); + trigger_error($this->user->lang('MAX_NUM_SEARCH_KEYWORDS_REFINE', (int) $this->config['max_num_search_keywords'], $num_keywords)); } // $keywords input format: each word separated by a space, words in a bracket are not separated |