use consistent tagging patterns with relationship partner

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index d74219501a0ce3501888994bf715e908320188af..9e19caa0b0a4ff60e10cf8561a03233ce4ce6e0e 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -68,7 +68,10 @@ function profiles_post(&$a) {
                        if($with != strip_tags($orig[0]['with'])) {
                                $prf = '';
                                $lookup = $with;
-                               if((strpos($lookup,'@')) || (strpos($lookup,'http://'))) {
+                               if(strpos($lookup,'@') === 0)
+                                       $lookup = substr($lookup,1);
+                               $lookup = str_replace('_',' ', $lookup);
+                               if(strpos($lookup,'@') || (strpos($lookup,'http://'))) {
                                        $newname = $lookup;
                                        $links = @lrdd($lookup);
                                        if(count($links)) {
@@ -101,6 +104,8 @@ function profiles_post(&$a) {
        
                                if($prf) {
                                        $with = str_replace($lookup,'<a href="' . $prf . '">' . $newname        . '</a>', $with);
+                                       if(strpos($with,'@') === 0)
+                                               $with = substr($with,1);
                                }
                        }
                        else
@@ -200,11 +205,9 @@ function profiles_post(&$a) {
 
                if($is_default) {
                        // Update global directory in background
-                       $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
                        $url = $_SESSION['my_url'];
                        if($url && strlen(get_config('system','directory_submit_url')))
-                               //proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &", array(),$foo));
-                               proc_run($php_path,"include/directory.php","$url");
+                               proc_run('php',"include/directory.php","$url");
                }
        }
 }