Edited view/sv/settings.tpl via GitHub

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index 4e3f03799a4dd5e02bb8ecba4c087cea19b29dfd..409999a3e86785dbc570847169e066488cd842c0 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
@@ -221,7 +226,7 @@ function profiles_content(&$a) {
        }
 
        if(($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) {
-               $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 AND `self` = 0 LIMIT 1",
+               $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
                        intval($a->argv[2]),
                        intval(local_user())
                );
@@ -238,8 +243,9 @@ function profiles_content(&$a) {
                        intval($a->argv[2]),
                        intval(local_user())
                );
-               $r = q("DELETE FROM `profile` WHERE `id` = %d LIMIT 1",
-                       intval($a->argv[2])
+               $r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       intval($a->argv[2]),
+                       intval(local_user())
                );
                if($r)
                        notice( t('Profile deleted.') . EOL);