diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-03-13 11:02:29 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-03-13 11:02:29 +0100 |
| commit | 4ecfc07e037b2a2e70eab09e7759e37ebf585de1 (patch) | |
| tree | e65be004628650dacaf6cc145421e50fe7896fdc /phpBB/includes | |
| parent | 16e7a1d9315338a0cf2f048cb0fe3fd5905e182e (diff) | |
| parent | db63d0fbf9f34f7b401d2211ea43dd25c0efcd45 (diff) | |
| download | forums-4ecfc07e037b2a2e70eab09e7759e37ebf585de1.tar forums-4ecfc07e037b2a2e70eab09e7759e37ebf585de1.tar.gz forums-4ecfc07e037b2a2e70eab09e7759e37ebf585de1.tar.bz2 forums-4ecfc07e037b2a2e70eab09e7759e37ebf585de1.tar.xz forums-4ecfc07e037b2a2e70eab09e7759e37ebf585de1.zip | |
Merge pull request #2113 from nickvergessen/ticket/8041
[ticket/8041] Merge item name into "Return to" string for better translations
* nickvergessen/ticket/8041:
[ticket/8041] Add space/tabs after => in array list
[ticket/8041] Wrap forum name, topic title and pm folder name with quotes
[ticket/8041] Merge item name into "Return to" string for better translations
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php index 517ae0b08c..7e13b5b9c6 100644 --- a/phpBB/includes/ucp/ucp_pm.php +++ b/phpBB/includes/ucp/ucp_pm.php @@ -352,9 +352,10 @@ class ucp_pm else if ($action == 'view_message') { $template->assign_vars(array( - 'S_VIEW_MESSAGE' => true, - 'MSG_ID' => $msg_id) - ); + 'S_VIEW_MESSAGE' => true, + 'L_RETURN_TO_FOLDER' => $user->lang('RETURN_TO', $folder_status['folder_name']), + 'MSG_ID' => $msg_id, + )); if (!$msg_id) { |