multi-user, do not cache open mbox

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 4821a45d263bc0aa5a1bb12d05ce7e84e2a3c44c..7f17a362b3cb518770fd5a2ac3994bc11d8825a0 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -168,10 +168,13 @@ function message_content(&$a) {
 
                $a->page['htmlhead'] .= replace_macros($tpl, array(
                        '$baseurl' => $a->get_baseurl(),
-                       '$nickname' => $a->user['nickname']
+                       '$nickname' => $a->user['nickname'],
+                       '$linkurl' => t('Please enter a link URL:')
                ));
        
-               $select = contact_select('messageto','message-to-select', false, 4, true);
+               $preselect = (isset($a->argv[2])?array($a->argv[2]):false);
+       
+               $select = contact_select('messageto','message-to-select', $preselect, 4, true);
                $tpl = load_view_file('view/prv_message.tpl');
                $o .= replace_macros($tpl,array(
                        '$header' => t('Send Private Message'),
@@ -234,7 +237,7 @@ function message_content(&$a) {
                                '$delete' => t('Delete conversation'),
                                '$body' => $rr['body'],
                                '$to_name' => $rr['name'],
-                               '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'],'D, d M Y - g:i A')
+                               '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A'))
                        ));
                }
                $o .= paginate($a);