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

WebFinger aliases with 'index.php/'

Browse Source
This commit is contained in:
Mikael Nordfeldth
2016-02-21 20:00:07 +01:00
parent 1edb1bbc17
commit ce803f6d06
3 changed files with 61 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/WebFinger/WebFingerPlugin.php
View File

@@ -105,11 +105,16 @@ class WebFingerPlugin extends Plugin
$profile = $user->getProfile();
} catch (NoResultException $e) {
try {
// common_fake_local_fancy_url can throw an exception
$fancy_url = common_fake_local_fancy_url($resource);
try { // if it's a /index.php/ url
// common_fake_local_fancy_url can throw an exception
$alt_url = common_fake_local_fancy_url($resource);
} catch (Exception $e) { // let's try to create a fake local /index.php/ url
// this too if it can't do anything about the URL
$alt_url = common_fake_local_nonfancy_url($resource);
}
// and this will throw a NoResultException if not found
$user = User::getByUri($fancy_url);
$user = User::getByUri($alt_url);
$profile = $user->getProfile();
} catch (Exception $e) {
// if our rewrite hack didn't work, try to get something by profile URL