mirror of
https://github.com/friendica/friendica
synced 2025-04-23 03:50:13 +00:00
one true profile photo, force nicknames
This commit is contained in:
parent
6695b4a203
commit
c3fd5ed732
16 changed files with 276 additions and 216 deletions
|
@ -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];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue