aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-01-24 12:33:36 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-01-24 12:33:36 +0000
commit5f0b61065fdd107d32fa1f2c0b80981a239218a7 (patch)
tree16efa55cf044b08069e203bae966c47a8a7b6bb8
parent9e5c25504e275d8de071f2efafa349ebee21063c (diff)
downloadforums-5f0b61065fdd107d32fa1f2c0b80981a239218a7.tar
forums-5f0b61065fdd107d32fa1f2c0b80981a239218a7.tar.gz
forums-5f0b61065fdd107d32fa1f2c0b80981a239218a7.tar.bz2
forums-5f0b61065fdd107d32fa1f2c0b80981a239218a7.tar.xz
forums-5f0b61065fdd107d32fa1f2c0b80981a239218a7.zip
unknown
git-svn-id: file:///svn/phpbb/trunk@6926 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewmessage.php4
-rw-r--r--phpBB/language/en/acp/language.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index af476aabe7..4bda60834e 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -272,11 +272,11 @@ function message_history($msg_id, $user_id, $message_row, $folder)
{
$folder_id = (int) $row['folder_id'];
- $row['folder'][] = (isset($folder[$folder_id])) ? '<a href="' . $folder_url . $folder_id . '">' . $folder[$folder_id]['folder_name'] . '</a>' : $user->lang['UNKOWN_FOLDER'];
+ $row['folder'][] = (isset($folder[$folder_id])) ? '<a href="' . $folder_url . $folder_id . '">' . $folder[$folder_id]['folder_name'] . '</a>' : $user->lang['UNKNOWN_FOLDER'];
if (isset($rowset[$row['msg_id']]))
{
- $rowset[$row['msg_id']]['folder'][] = (isset($folder[$folder_id])) ? '<a href="' . $folder_url . $folder_id . '">' . $folder[$folder_id]['folder_name'] . '</a>' : $user->lang['UNKOWN_FOLDER'];
+ $rowset[$row['msg_id']]['folder'][] = (isset($folder[$folder_id])) ? '<a href="' . $folder_url . $folder_id . '">' . $folder[$folder_id]['folder_name'] . '</a>' : $user->lang['UNKNOWN_FOLDER'];
}
else
{
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index 4c60fdc116..4c586e1815 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -87,7 +87,7 @@ $lang = array_merge($lang, array(
'UNABLE_TO_WRITE_FILE' => 'The file could not be written to %s.',
'UPLOAD_COMPLETED' => 'The upload was completed successfully.',
- 'UPLOAD_FAILED' => 'The upload failed for unkown reasons. You may need to replace the relevant file manually.',
+ 'UPLOAD_FAILED' => 'The upload failed for unknown reasons. You may need to replace the relevant file manually.',
'UPLOAD_METHOD' => 'Upload method',
'UPLOAD_SETTINGS' => 'Upload settings',