makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

unknown

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6926 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-01-24 12:33:36 +00:00
parent 9e5c25504e
commit 5f0b61065f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/ucp/ucp_pm_viewmessage.php
View file

@ -272,11 +272,11 @@ function message_history($msg_id, $user_id, $message_row, $folder)
{ {
$folder_id = (int) $row['folder_id']; $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']])) 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 else
{ {

2
phpBB/language/en/acp/language.php
View file

@ -87,7 +87,7 @@ $lang = array_merge($lang, array(
'UNABLE_TO_WRITE_FILE' => 'The file could not be written to %s.', 'UNABLE_TO_WRITE_FILE' => 'The file could not be written to %s.',
'UPLOAD_COMPLETED' => 'The upload was completed successfully.', '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_METHOD' => 'Upload method',
'UPLOAD_SETTINGS' => 'Upload settings', 'UPLOAD_SETTINGS' => 'Upload settings',