diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-09 14:00:54 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-09 14:00:54 -0400 |
| commit | 39a7926015f06c96aeb3ae1439fdec97fc123c59 (patch) | |
| tree | 2e0fc7f6e58e8b1d216f1a03809d55e5fdcd1e96 /mod/message.php | |
| parent | 34d3d455892cbad299aac8710016daffefb1c4cb (diff) | |
| parent | 53157bb954acb7597347c6b4a87e64e7a2f6cc79 (diff) | |
| download | volse-hubzilla-39a7926015f06c96aeb3ae1439fdec97fc123c59.tar.gz volse-hubzilla-39a7926015f06c96aeb3ae1439fdec97fc123c59.tar.bz2 volse-hubzilla-39a7926015f06c96aeb3ae1439fdec97fc123c59.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
send browser back to correct page (with query args) after posting
slight improvement in a couple of queries
Diabook-dark - do things the right way instead of the stupid way.
Fix TinyMCE, but needs adding to theme.php
Fix jquery.fancybox, but still needs adding to theme.php
Diabook-dark cleaned up a bit.
don't provide 'show more' on remote friends in common unless there are actually more
make it optional to optimize the item table after expire
wrap private message autocomplete in an ifdef to make it easier to test/develop
DE update for the strings
make mod-follow hookable (e.g. service class limits) and also begin to prepare it for functionalisation
* master:
Diffstat (limited to 'mod/message.php')
| -rw-r--r-- | mod/message.php | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/mod/message.php b/mod/message.php index 867f199c4..b8695fdd9 100644 --- a/mod/message.php +++ b/mod/message.php @@ -173,15 +173,22 @@ function message_content(&$a) { $preselect = (isset($a->argv[2])?array($a->argv[2]):false); - $select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10); + if(defined('EMAIL_AUTOCOMP')) { -// here's sort of where we want to do contact autocomplete -// comment out the contact selector line just above and use the following one instead, -// then figure out how to make it do the right thing -// pictures would be nice, but that didn't seem to work when I tried it -// (the json backend is found in mod/acl.php) + // here's where we want to do contact autocomplete + // just figure out how to make it do the right thing + // pictures would be nice, but that didn't work when I tried. + // It sort of barely works, but needs help + // (the json backend is found in mod/acl.php) -// $select = '<input type="text" id="recip" name="messageto" value="' . $preselect .'" />'; + $select = '<input type="text" id="recip" name="messageto" value="' . $preselect .'" />'; + } + else { + + // the ugly select box + + $select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10); + } $tpl = get_markup_template('prv_message.tpl'); $o .= replace_macros($tpl,array( |