diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-09-02 17:32:15 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-09-02 17:32:15 +0200 |
| commit | ba0072080d591d2d01cae89872a9da035a0ec401 (patch) | |
| tree | f4606f298463a24c15b7f3fee3960f8fa2058d44 /phpBB | |
| parent | ebb4a50d9ba539ea98d6af6f29adc1f25eadc4b0 (diff) | |
| parent | c901a9eb70b9d66966f853b0381e05bc9f50fb00 (diff) | |
| download | forums-ba0072080d591d2d01cae89872a9da035a0ec401.tar forums-ba0072080d591d2d01cae89872a9da035a0ec401.tar.gz forums-ba0072080d591d2d01cae89872a9da035a0ec401.tar.bz2 forums-ba0072080d591d2d01cae89872a9da035a0ec401.tar.xz forums-ba0072080d591d2d01cae89872a9da035a0ec401.zip | |
Merge branch 'ticket/jellydoughnut/9662' into develop-olympus
* ticket/jellydoughnut/9662:
[ticket/9662] Search flood interval no longer applies to non-keyword searches
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/search.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index 1e1e42d01f..96f320fe9f 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -81,9 +81,10 @@ if ($user->load && $config['limit_search_load'] && ($user->load > doubleval($con trigger_error('NO_SEARCH_TIME'); } -// Check flood limit ... if applicable +// It is applicable if the configuration setting is non-zero, and the user cannot +// ignore the flood setting, and the search is a keyword search. $interval = ($user->data['user_id'] == ANONYMOUS) ? $config['search_anonymous_interval'] : $config['search_interval']; -if ($interval && !$auth->acl_get('u_ignoreflood')) +if ($interval && !in_array($search_id, array('unreadposts', 'unanswered', 'active_topics', 'egosearch')) && !$auth->acl_get('u_ignoreflood')) { if ($user->data['user_last_search'] > time() - $interval) { |