Merge remote branch 'upstream/master'

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
old mode 100755 (executable)
new mode 100644 (file)
index 6638616..51f9444
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -14,7 +14,7 @@ function profile_init(&$a) {
        else {
                $r = q("select nickname from user where blocked = 0 and account_expired = 0 and verified = 1 order by rand() limit 1");
                if(count($r)) {
-                       $which = $r[0]['nickname'];
+                       goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']);
                }
                else {
                        notice( t('Requested profile is not available.') . EOL );
@@ -124,11 +124,9 @@ function profile_content(&$a, $update = 0) {
                return;
        }
 
-       require_once('include/contact_widgets.php');
+       if(! $update) {
 
-       $a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
 
-       if(! $update) {
                if(x($_GET,'tab'))
                        $tab = notags(trim($_GET['tab']));
 
@@ -150,6 +148,7 @@ function profile_content(&$a, $update = 0) {
 
                $celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
+               $a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
 
                if(can_write_wall($a,$a->profile['profile_uid'])) {