keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bug #117, use realname for screen_name in API if nickname missing

Browse source
This commit is contained in:
Friendika 2011-08-05 21:30:12 -07:00
parent 8ae0a8a94c
commit aa3a14ec36
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -7,7 +7,7 @@ require_once('include/text.php');
require_once("include/pgettext.php"); require_once("include/pgettext.php");
define ( 'FRIENDIKA_VERSION', '2.2.1062' ); define ( 'FRIENDIKA_VERSION', '2.2.1063' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1077 ); define ( 'DB_UPDATE_VERSION', 1077 );

4
include/api.php
View file

@ -303,7 +303,7 @@
'uid' => intval($uinfo[0]['uid']), 'uid' => intval($uinfo[0]['uid']),
'id' => intval($uinfo[0]['cid']), 'id' => intval($uinfo[0]['cid']),
'name' => $uinfo[0]['name'], 'name' => $uinfo[0]['name'],
'screen_name' => $uinfo[0]['nick'], 'screen_name' => (($uinfo[0]['nick']) ? $uinfo[0]['nick'] : $uinfo[0]['name']),
'location' => ($usr) ? $usr[0]['default-location'] : '', 'location' => ($usr) ? $usr[0]['default-location'] : '',
'profile_image_url' => $uinfo[0]['micro'], 'profile_image_url' => $uinfo[0]['micro'],
'url' => $uinfo[0]['url'], 'url' => $uinfo[0]['url'],
@ -356,7 +356,7 @@
'uid' => 0, 'uid' => 0,
'id' => 0, 'id' => 0,
'name' => $item['author-name'], 'name' => $item['author-name'],
'screen_name' => '', 'screen_name' => $item['author_name'],
'location' => '', //$uinfo[0]['default-location'], 'location' => '', //$uinfo[0]['default-location'],
'profile_image_url' => $item['author-avatar'], 'profile_image_url' => $item['author-avatar'],
'url' => $item['author-link'], 'url' => $item['author-link'],