use consistent tagging patterns with relationship partner

diff --git a/boot.php b/boot.php
index 77ff230563920cdff6381f681c4fa2c30f3f585c..4a0acef936bb4e848057dd43950b8be62c775525 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -3,7 +3,7 @@
 set_time_limit(0);
 
 define ( 'BUILD_ID',               1039   );
-define ( 'FRIENDIKA_VERSION',      '2.10.0907' );
+define ( 'FRIENDIKA_VERSION',      '2.10.0908' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
 
 define ( 'EOL',                    "<br />\r\n"     );

diff --git a/mod/profiles.php b/mod/profiles.php
index 4e3f03799a4dd5e02bb8ecba4c087cea19b29dfd..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