use gravatar for default avatars

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 0389788ec9bfe21c99795f6e7a0f8a9f7b3e08b1..430500f99876906ef5d4fe1d48d05f31c3748e44 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -121,6 +121,11 @@ function item_post(&$a) {
 
        if(count($tags)) {
                foreach($tags as $tag) {
+                       if(strpos($tag,'#') === 0) {
+                               $basetag = substr($tag,1);
+                               $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . urlencode($basetag) . ']' . $basetag . '[/url]',$body);
+                               continue;
+                       }
                        if(strpos($tag,'@') === 0) {
                                $name = substr($tag,1);
                                if((strpos($name,'@')) || (strpos($name,'http://'))) {
@@ -155,6 +160,7 @@ function item_post(&$a) {
                                        }
                                        if(count($r)) {
                                                $profile = $r[0]['url'];
+                                               $newname = $r[0]['name'];
                                                if(strlen($inform))
                                                        $inform .= ',';
                                                $inform .= 'cid:' . $r[0]['id'];
@@ -251,6 +257,7 @@ function item_post(&$a) {
                                        '$username' => $user['username'],
                                        '$email' => $user['email'],
                                        '$from' => $from,
+                                       '$display' => $a->get_baseurl() . '/display/' . $post_id,
                                        '$body' => strip_tags(bbcode($body))
                                ));
 
@@ -273,6 +280,7 @@ function item_post(&$a) {
                                        '$username' => $user['username'],
                                        '$email' => $user['email'],
                                        '$from' => $from,
+                                       '$display' => $a->get_baseurl() . '/display/' . $post_id,
                                        '$body' => strip_tags(bbcode($body))
                                ));
 
@@ -301,9 +309,8 @@ function item_post(&$a) {
        }
 
        $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-       $proc_debug = get_config('system','proc_debug');
 
-       proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" $proc_debug &",
+       proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &",
                array(),$foo));
 
        goaway($a->get_baseurl() . "/" . $_POST['return'] );
@@ -390,12 +397,10 @@ function item_content(&$a) {
                        }
                        $drop_id = intval($item['id']);
                        $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-                       $proc_debug = get_config('system','proc_debug');
-
                        
                        // send the notification upstream/downstream as the case may be
 
-                       proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" $proc_debug &",
+                       proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" &",
                                array(), $foo));
 
                        goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);