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

Revert renaming lang to language in api

Browse source 
- Normalize some quotes
- Put "Empty user-agent" log message in a else statement
This commit is contained in:
Hypolite Petovan 2018-07-04 17:33:09 -04:00
parent cdab9b4cd2
commit e44111e935
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/api.php
View file

@ -97,10 +97,10 @@ function api_source()
} }
logger("Unrecognized user-agent ".$_SERVER['HTTP_USER_AGENT'], LOGGER_DEBUG); logger("Unrecognized user-agent ".$_SERVER['HTTP_USER_AGENT'], LOGGER_DEBUG);
} else {
logger("Empty user-agent", LOGGER_DEBUG);
} }
logger("Empty user-agent", LOGGER_DEBUG);
return "api"; return "api";
} }
@ -480,7 +480,7 @@ function api_rss_extra(App $a, $arr, $user_info)
'base' => System::baseUrl(), 'base' => System::baseUrl(),
'updated' => api_date(null), 'updated' => api_date(null),
'atom_updated' => DateTimeFormat::utcNow(DateTimeFormat::ATOM), 'atom_updated' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
'language' => $user_info['language'], 'language' => $user_info['lang'],
'logo' => System::baseUrl() . "/images/friendica-32.png", 'logo' => System::baseUrl() . "/images/friendica-32.png",
]; ];
@ -665,7 +665,7 @@ function api_get_user(App $a, $contact_id = null)
'geo_enabled' => false, 'geo_enabled' => false,
'verified' => false, 'verified' => false,
'statuses_count' => 0, 'statuses_count' => 0,
'language' => '', 'lang' => '',
'contributors_enabled' => false, 'contributors_enabled' => false,
'is_translator' => false, 'is_translator' => false,
'is_translation_enabled' => false, 'is_translation_enabled' => false,
@ -746,7 +746,7 @@ function api_get_user(App $a, $contact_id = null)
'geo_enabled' => false, 'geo_enabled' => false,
'verified' => true, 'verified' => true,
'statuses_count' => intval($countitems), 'statuses_count' => intval($countitems),
'language' => '', 'lang' => '',
'contributors_enabled' => false, 'contributors_enabled' => false,
'is_translator' => false, 'is_translator' => false,
'is_translation_enabled' => false, 'is_translation_enabled' => false,
@ -1305,19 +1305,19 @@ function api_status_show($type)
'in_reply_to_screen_name' => $in_reply_to['screen_name'], 'in_reply_to_screen_name' => $in_reply_to['screen_name'],
'user' => $user_info, 'user' => $user_info,
$geo => null, $geo => null,
'coordinates' => "", 'coordinates' => '',
'place' => "", 'place' => '',
'contributors' => "", 'contributors' => '',
'is_quote_status' => false, 'is_quote_status' => false,
'retweet_count' => 0, 'retweet_count' => 0,
'favorite_count' => 0, 'favorite_count' => 0,
'favorited' => $lastwall['starred'] ? true : false, 'favorited' => $lastwall['starred'] ? true : false,
'retweeted' => false, 'retweeted' => false,
'possibly_sensitive' => false, 'possibly_sensitive' => false,
'language' => "", 'lang' => '',
'statusnet_html' => $converted["html"], 'statusnet_html' => $converted["html"],
'statusnet_conversation_id' => $lastwall['parent'], 'statusnet_conversation_id' => $lastwall['parent'],
'external_url' => System::baseUrl() . "/display/" . $lastwall['guid'], 'external_url' => System::baseUrl() . '/display/' . $lastwall['guid'],
]; ];
if (count($converted["attachments"]) > 0) { if (count($converted["attachments"]) > 0) {