Rename App->path to App->urlpath

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 8d156cbd64f9681b1b5b7d36d1339edcaa38aac8..08c0dfdb86a9e4e16928d81ba2584e67568075df 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -79,7 +79,7 @@ function profile_init(App $a)
        $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/" title="' . L10n::t('%s\'s posts', $a->profile['username']) . '"/>' . "\r\n";
        $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/comments" title="' . L10n::t('%s\'s comments', $a->profile['username']) . '"/>' . "\r\n";
        $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/activity" title="' . L10n::t('%s\'s timeline', $a->profile['username']) . '"/>' . "\r\n";
-       $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . ($a->path ? '/' . $a->path : ''));
+       $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . ($a->urlpath ? '/' . $a->urlpath : ''));
        $a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
        header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
@@ -191,10 +191,6 @@ function profile_content(App $a, $update = 0)
 
                $o .= Widget::commonFriendsVisitor($a->profile['profile_uid']);
 
-               if (x($_SESSION, 'new_member') && $is_owner) {
-                       $o .= '<div id="newmember-tips"><a href="newmember"><b>' . L10n::t('Tips for New Members') . '</b></a></div>';
-               }
-
                $commpage = $a->profile['page-flags'] == PAGE_COMMUNITY;
                $commvisitor = $commpage && $remote_contact;
 
@@ -286,6 +282,8 @@ function profile_content(App $a, $update = 0)
 
                if (!DBM::is_result($r)) {
                        $sql_extra3 = sprintf(" AND `thread`.`contact-id` = %d ", intval(intval($a->profile['contact_id'])));
+               } else {
+                       $sql_extra3 = "";
                }
 
                //  check if we serve a mobile device and get the user settings