GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Use HTTPS for links to Twitter profiles as well

Browse Source
This commit is contained in:
Stephen Paul Weber 2015-10-23 16:24:04 +00:00
parent d1f1063900
commit 439b466979
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/TwitterBridge/lib/twitterimport.php
View File

@ -241,6 +241,16 @@ class TwitterImport
protected function ensureProfile($twuser) protected function ensureProfile($twuser)
{ {
// check to see if there's already a profile for this user // check to see if there's already a profile for this user
$profileurl = 'https://twitter.com/' . $twuser->screen_name;
try {
$profile = $this->getProfileByUrl($twuser->screen_name, $profileurl);
$this->updateAvatar($twuser, $profile);
return $profile;
} catch (NoResultException $e) {
common_debug(__METHOD__ . ' - Falling back to check for http: ' .
"for Twitter user: $profileurl.");
}
$profileurl = 'http://twitter.com/' . $twuser->screen_name; $profileurl = 'http://twitter.com/' . $twuser->screen_name;
try { try {
$profile = $this->getProfileByUrl($twuser->screen_name, $profileurl); $profile = $this->getProfileByUrl($twuser->screen_name, $profileurl);
@ -527,9 +537,9 @@ class TwitterImport
static function atLink($screenName, $fullName, $orig) static function atLink($screenName, $fullName, $orig)
{ {
if (!empty($fullName)) { if (!empty($fullName)) {
return "<a href='http://twitter.com/#!/{$screenName}' title='{$fullName}'>{$orig}</a>"; return "<a href='https://twitter.com/{$screenName}' title='{$fullName}'>{$orig}</a>";
} else { } else {
return "<a href='http://twitter.com/#!/{$screenName}'>{$orig}</a>"; return "<a href='https://twitter.com/{$screenName}'>{$orig}</a>";
} }
} }