diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-18 18:23:22 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-18 18:23:22 -0500 |
| commit | 3f27890a5e78849582cb1ffec485ee3492671837 (patch) | |
| tree | 2674de10a4162d90e580b27b057204b2eddc136c /phpBB/includes/ucp | |
| parent | 4b3264d9bbe81cec987fc6d01b7d12d29585654e (diff) | |
| parent | b3fdf8a0463438e1e86979a5a4e50611228aea52 (diff) | |
| download | forums-3f27890a5e78849582cb1ffec485ee3492671837.tar forums-3f27890a5e78849582cb1ffec485ee3492671837.tar.gz forums-3f27890a5e78849582cb1ffec485ee3492671837.tar.bz2 forums-3f27890a5e78849582cb1ffec485ee3492671837.tar.xz forums-3f27890a5e78849582cb1ffec485ee3492671837.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/includes/functions.php
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index d8bcd374fe..934ff566cc 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -749,7 +749,8 @@ function compose_pm($id, $mode, $action, $user_folders = array()) $return_box_lang = ($action === 'post' || $action === 'edit') ? 'PM_OUTBOX' : 'PM_INBOX'; - $message = $user->lang['MESSAGE_STORED'] . '<br /><br />' . sprintf($user->lang['VIEW_PRIVATE_MESSAGE'], '<a href="' . $return_message_url . '">', '</a>'); + $save_message = ($action === 'edit') ? $user->lang['MESSAGE_EDITED'] : $user->lang['MESSAGE_STORED']; + $message = $save_message . '<br /><br />' . $user->lang('VIEW_PRIVATE_MESSAGE', '<a href="' . $return_message_url . '">', '</a>'); $last_click_type = 'CLICK_RETURN_FOLDER'; if ($folder_url) |