Merge https://github.com/friendica/red into pending_merge

2015-01-31 14:53:11 -08:00
parent a7e5c7ce64 3e5226adc7
commit acac58fba0
3 changed files with 16 additions and 6 deletions
--- 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