add diaspora support to dfrn_confirm (friendship confirmation)

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index c9ff3bb8e42737fbe9cff4ef06affd7fbe72e48d..ad598eb7d07f1b7f4b9a9e76d5d651743b56c694 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -78,7 +78,7 @@ function message_post(&$a) {
 
        $match = null;
 
-       if(preg_match_all("/\[img\](.+?)\[\/img\]/",$body,$match)) {
+       if(preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
                $images = $match[1];
                if(count($images)) {
                        foreach($images as $image) {
@@ -99,7 +99,7 @@ function message_post(&$a) {
        
        if($post_id) {
                proc_run('php',"include/notifier.php","mail","$post_id");
-               notice( t('Message sent.') . EOL );
+               info( t('Message sent.') . EOL );
        }
        else {
                notice( t('Message could not be sent.') . EOL );
@@ -139,7 +139,7 @@ function message_content(&$a) {
                                intval(local_user())
                        );
                        if($r) {
-                               notice( t('Message deleted.') . EOL );
+                               info( t('Message deleted.') . EOL );
                        }
                        goaway($a->get_baseurl() . '/message' );
                }
@@ -155,7 +155,7 @@ function message_content(&$a) {
                                        intval(local_user())
                                );
                                if($r)
-                                       notice( t('Conversation removed.') . EOL );
+                                       info( t('Conversation removed.') . EOL );
                        } 
                        goaway($a->get_baseurl() . '/message' );
                }       
@@ -221,7 +221,7 @@ function message_content(&$a) {
                        intval($a->pager['itemspage'])
                );
                if(! count($r)) {
-                       notice( t('No messages.') . EOL);
+                       info( t('No messages.') . EOL);
                        return $o;
                }
 
@@ -328,4 +328,4 @@ function message_content(&$a) {
                return $o;
        }
 
-}
\ No newline at end of file
+}