Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12566] Also changed for ucp_pm_viewmessage.php
  [ticket/12566] "Private messages" should be "Send pivate message"
This commit is contained in:
Cesar G 2014-06-02 13:48:01 -07:00
commit a090260a73
2 changed files with 2 additions and 2 deletions

View file

@ -283,7 +283,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
$contact_fields = array( $contact_fields = array(
array( array(
'ID' => 'pm', 'ID' => 'pm',
'NAME' => $user->lang['PRIVATE_MESSAGE'], 'NAME' => $user->lang['SEND_PRIVATE_MESSAGE'],
'U_CONTACT' => $u_pm, 'U_CONTACT' => $u_pm,
), ),
array( array(

View file

@ -1809,7 +1809,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
$contact_fields = array( $contact_fields = array(
array( array(
'ID' => 'pm', 'ID' => 'pm',
'NAME' => $user->lang['PRIVATE_MESSAGES'], 'NAME' => $user->lang['SEND_PRIVATE_MESSAGE'],
'U_CONTACT' => $u_pm, 'U_CONTACT' => $u_pm,
), ),
array( array(