aboutsummaryrefslogtreecommitdiffstats
path: root/mod/message.php
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-04-04 01:22:05 -0700
committerFriendika <info@friendika.com>2011-04-04 01:22:05 -0700
commit379af2521559c263622348bce41872b61067e532 (patch)
tree1e082da12910b6e7ee187c64a2f8ade50479516b /mod/message.php
parentb5bcf44354410e2c37d5ec143c7050c3903200ed (diff)
parent890753e5b545ca5777c6c9084e99cacf42a3b485 (diff)
downloadvolse-hubzilla-379af2521559c263622348bce41872b61067e532.tar.gz
volse-hubzilla-379af2521559c263622348bce41872b61067e532.tar.bz2
volse-hubzilla-379af2521559c263622348bce41872b61067e532.zip
Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup
Conflicts: mod/dfrn_poll.php
Diffstat (limited to 'mod/message.php')
-rw-r--r--mod/message.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/mod/message.php b/mod/message.php
index 7978ecaf2..7f17a362b 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -172,7 +172,9 @@ function message_content(&$a) {
'$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'),