Merge branch 'fabrixxm-master'

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 251b5a4149125d80796ce32b1ebb88f8cf120584..7615f22bec727ff4ec22b63ba3e8d83296f56221 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -72,8 +72,8 @@ function message_post(&$a) {
        $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
        
        if($post_id) {
-               proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &",
-                       array(),$foo));
+               //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &", array(),$foo));
+               proc_run($php_path,"include/notifier.php","mail","$post_id");
                notice( t('Message sent.') . EOL );
        }
        else {
@@ -270,7 +270,7 @@ function message_content(&$a) {
                                '$sparkle' => $sparkle,
                                '$from_photo' => $message['from-photo'],
                                '$subject' => $message['title'],
-                               '$body' => bbcode($message['body']),
+                               '$body' => smilies(bbcode($message['body'])),
                                '$delete' => t('Delete message'),
                                '$to_name' => $message['name'],
                                '$date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A')