diff options
| author | czaks <marcin@6irc.net> | 2013-07-20 17:28:34 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-07-20 17:28:34 -0400 |
| commit | 9f323ae65fb9370a93d1aaa869ab5edfbaca49cf (patch) | |
| tree | 926a464440df8a37509ae54165edefac4a89d874 /inc/config.php | |
| parent | f04566f6d30553560d5a69e25e38de72a60f297c (diff) | |
| parent | e8b693b0447e5a61f740b27c5f3a57f68d544342 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
templates/themes/sitemap/info.php
Diffstat (limited to 'inc/config.php')
| -rw-r--r-- | inc/config.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/inc/config.php b/inc/config.php index 1140b1c9..bbc899ef 100644 --- a/inc/config.php +++ b/inc/config.php @@ -899,8 +899,8 @@ // Number of news entries to display per page $config['mod']['news_page'] = 40; - // Maximum number of results to display for a search, per board - $config['mod']['search_results'] = 75; + // Number of results to dispaly per page + $config['mod']['search_page'] = 200; // How many entries to show per page in the moderator noticeboard $config['mod']['noticeboard_page'] = 50; @@ -1057,7 +1057,7 @@ $config['mod']['master_pm'] = ADMIN; // Rebuild everything $config['mod']['rebuild'] = ADMIN; - // Search through posts + // Search through posts, IP address notes and bans $config['mod']['search'] = JANITOR; // Read the moderator noticeboard $config['mod']['noticeboard'] = JANITOR; |