aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-09-04 06:40:15 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-09-04 06:40:15 +0000
commite2863ca2a3150eeb8a5b6e29f9f5e6773ed38237 (patch)
tree46d40d1aa2a801ee557a6b4a106da2ab829cf5e5 /phpBB
parentc7abce74901a2a18e715b25666c67b8ea547f475 (diff)
downloadforums-e2863ca2a3150eeb8a5b6e29f9f5e6773ed38237.tar
forums-e2863ca2a3150eeb8a5b6e29f9f5e6773ed38237.tar.gz
forums-e2863ca2a3150eeb8a5b6e29f9f5e6773ed38237.tar.bz2
forums-e2863ca2a3150eeb8a5b6e29f9f5e6773ed38237.tar.xz
forums-e2863ca2a3150eeb8a5b6e29f9f5e6773ed38237.zip
ups
git-svn-id: file:///svn/phpbb/trunk@8078 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/language/en/common.php2
-rw-r--r--phpBB/memberlist.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index c84b940d96..f83fa46244 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -370,7 +370,7 @@ $lang = array_merge($lang, array(
'NO_SUCH_SEARCH_MODULE' => 'The specified search backend doesn’t exist.',
'NO_SUPPORTED_AUTH_METHODS' => 'No supported authentication methods.',
'NO_TOPIC' => 'The requested topic does not exist.',
- 'NO_TOPIC_FORUM' => 'The topic or forum no longer exist.',
+ 'NO_TOPIC_FORUM' => 'The topic or forum no longer exists.',
'NO_TOPICS' => 'There are no topics or posts in this forum.',
'NO_TOPICS_TIME_FRAME' => 'No topics exist inside this forum for the selected time frame.',
'NO_UNREAD_PM' => '<strong>0</strong> unread messages',
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 1d885ddc59..33ddc3ba08 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1176,7 +1176,7 @@ switch ($mode)
'count_select' => array('count_select', 'eq'),
'joined' => array('joined', ''),
'active' => array('active', ''),
- 'count' => ($count !== '') ? array('count', 0) : array('count', ''),
+ 'count' => (request_var('count', '') !== '') ? array('count', 0) : array('count', ''),
'ipdomain' => array('ip', ''),
'first_char' => array('first_char', ''),
);