Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / include / identity.php

diff --git a/include/identity.php b/include/identity.php
index 1307b42b1bf6905ef09af6069308284f7b47797f..380560228ab81b7b0229ed7d04b013e14f15edb1 100644 (file)
--- a/include/identity.php
+++ b/include/identity.php
@@ -229,13 +229,16 @@ function profile_sidebar($profile, $block = 0) {
 
        // Is the local user already connected to that user?
        if ($connect AND local_user()) {
-               if (isset($profile["url"]))
+               if (isset($profile["url"])) {
                        $profile_url = normalise_link($profile["url"]);
-               else
+               }
+               else {
                        $profile_url = normalise_link(App::get_baseurl()."/profile/".$profile["nickname"]);
+               }
 
                $r = q("SELECT * FROM `contact` WHERE NOT `pending` AND `uid` = %d AND `nurl` = '%s'",
                        local_user(), $profile_url);
+
                if (dbm::is_result($r))
                        $connect = false;
        }
@@ -596,7 +599,7 @@ function get_events() {
        ));
 }
 
-function advanced_profile(&$a) {
+function advanced_profile(App &$a) {
 
        $o = '';
        $uid = $a->profile['uid'];
@@ -684,8 +687,9 @@ function advanced_profile(&$a) {
                        $profile['forumlist'] = array( t('Forums:'), ForumManager::profile_advanced($uid));
                }
 
-               if ($a->profile['uid'] == local_user())
+               if ($a->profile['uid'] == local_user()) {
                        $profile['edit'] = array(App::get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
+               }
 
                return replace_macros($tpl, array(
                        '$title' => t('Profile'),
@@ -803,7 +807,7 @@ function get_my_url() {
        return false;
 }
 
-function zrl_init(&$a) {
+function zrl_init(App &$a) {
        $tmp_str = get_my_url();
        if(validate_url($tmp_str)) {