diff options
| author | friendica <info@friendica.com> | 2015-01-31 00:50:20 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-31 00:50:20 -0800 |
| commit | e6a5f7800390e5091743d6a97c6fd8f54c5d1530 (patch) | |
| tree | 20c49c7d11b411b91530ef43374a208274ebbb57 /include/message.php | |
| parent | 4a243b63f7019a1e56ecf03b138cd7fc396236c2 (diff) | |
| parent | 3e5226adc70838c784a0b208de25fffde37a6679 (diff) | |
| download | volse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.tar.gz volse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.tar.bz2 volse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.zip | |
Merge branch 'master' into tres
Conflicts:
include/zot.php
Diffstat (limited to 'include/message.php')
| -rw-r--r-- | include/message.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/message.php b/include/message.php index 34fa2cd8d..bfc92cd6d 100644 --- a/include/message.php +++ b/include/message.php @@ -185,7 +185,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' dbesc($mid), dbesc($replyto), dbesc(datetime_convert()), - dbesc($expires) + dbescdate($expires) ); // verify the save |