aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-07-19 19:09:58 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-07-19 19:09:58 -0700
commitc3fd5ed73202f4dd17dda87ac968b0db4f44d423 (patch)
tree353a6394ebb8ea8eddd0f8dc862fa7d09a3ee0b1 /include
parent6695b4a203ab03941c8b3305a3e55cc02b85a5ac (diff)
downloadvolse-hubzilla-c3fd5ed73202f4dd17dda87ac968b0db4f44d423.tar.gz
volse-hubzilla-c3fd5ed73202f4dd17dda87ac968b0db4f44d423.tar.bz2
volse-hubzilla-c3fd5ed73202f4dd17dda87ac968b0db4f44d423.zip
one true profile photo, force nicknames
Diffstat (limited to 'include')
-rw-r--r--include/auth.php12
1 files changed, 2 insertions, 10 deletions
diff --git a/include/auth.php b/include/auth.php
index bbbe8eb0d..513d717e3 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -23,12 +23,7 @@ if((x($_SESSION,'authenticated')) && (! ($_POST['auth-params'] == 'login'))) {
if(strlen($a->user['timezone']))
date_default_timezone_set($a->user['timezone']);
- if(x($a->user,'nickname'))
- $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
- else
- $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['uid'];
-
-
+ $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
$r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
intval($_SESSION['uid']));
@@ -61,10 +56,7 @@ else {
$_SESSION['uid'] = $r[0]['uid'];
$_SESSION['admin'] = $r[0]['admin'];
$_SESSION['authenticated'] = 1;
- if(x($r[0],'nickname'))
- $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
- else
- $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['uid'];
+ $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
$_SESSION['sysmsg'] = "Welcome back " . $r[0]['username'] . EOL;
$a->user = $r[0];