summaryrefslogtreecommitdiff
path: root/inc/filters.php
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2013-08-03 19:05:25 -0400
committerczaks <marcin@6irc.net>2013-08-03 19:05:25 -0400
commita0855cdcf5634d64fbb1ba294b05c8365ce37338 (patch)
treefa1217beedf487c321405432ea746343ec6afcec /inc/filters.php
parent7d5fef9ace3bba46de40604b04ea2dee1dac7cb3 (diff)
parenta3fbff225927469e68efc7ab31977736f34c7480 (diff)
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts: inc/config.php inc/functions.php templates/generic_page.html templates/index.html
Diffstat (limited to 'inc/filters.php')
-rw-r--r--inc/filters.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/filters.php b/inc/filters.php
index 9f03154d..cd512821 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -132,10 +132,10 @@ class Filter {
function do_filters(array $post) {
global $config;
- if (!isset($config['flood_filters']))
+ if (!isset($config['filters']))
return;
- foreach ($config['flood_filters'] as $arr) {
+ foreach ($config['filters'] as $arr) {
$filter = new Filter($arr);
if ($filter->check($post))
$filter->action();