mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
unknown
git-svn-id: file:///svn/phpbb/trunk@6926 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -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
|
||||
{
|
||||
|
@@ -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',
|
||||
|
||||
|
Reference in New Issue
Block a user