aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-09-03 15:12:27 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-09-03 15:12:27 +0000
commitc7abce74901a2a18e715b25666c67b8ea547f475 (patch)
tree2300306894482cd34e515272ee01d20433ba9a99
parent273695dba8924f3191fa20477c98688e9b70a895 (diff)
downloadforums-c7abce74901a2a18e715b25666c67b8ea547f475.tar
forums-c7abce74901a2a18e715b25666c67b8ea547f475.tar.gz
forums-c7abce74901a2a18e715b25666c67b8ea547f475.tar.bz2
forums-c7abce74901a2a18e715b25666c67b8ea547f475.tar.xz
forums-c7abce74901a2a18e715b25666c67b8ea547f475.zip
fixing two tiny bugs...
git-svn-id: file:///svn/phpbb/trunk@8077 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/acp/acp_users.php2
-rw-r--r--phpBB/language/en/common.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index cab16af7b6..e54ebf0a95 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1192,7 +1192,7 @@ class acp_users
'view_smilies' => request_var('view_smilies', $this->optionget($user_row, 'viewsmilies')),
'view_sigs' => request_var('view_sigs', $this->optionget($user_row, 'viewsigs')),
'view_avatars' => request_var('view_avatars', $this->optionget($user_row, 'viewavatars')),
- 'view_wordcensor' => request_var('view_wordcensore', $this->optionget($user_row, 'viewcensors')),
+ 'view_wordcensor' => request_var('view_wordcensor', $this->optionget($user_row, 'viewcensors')),
'bbcode' => request_var('bbcode', $this->optionget($user_row, 'bbcode')),
'smilies' => request_var('smilies', $this->optionget($user_row, 'smilies')),
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 47bad2d3cd..c84b940d96 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -370,6 +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_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',