From d67254711264bbe82c80a9d2513a26f0ddf2c79d Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Tue, 23 Feb 2016 14:33:09 +0100 Subject: [PATCH] getAliases should be only a list (numeric array) --- classes/Managed_DataObject.php | 5 +++++ plugins/WebFinger/lib/webfingerresource.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/classes/Managed_DataObject.php b/classes/Managed_DataObject.php index cab7edd5c7..0857bb11f6 100644 --- a/classes/Managed_DataObject.php +++ b/classes/Managed_DataObject.php @@ -419,6 +419,11 @@ abstract class Managed_DataObject extends Memcached_DataObject * in Profile and Notice classes. */ public function getAliases() + { + return array_keys($this->getAliasesWithIDs()); + } + + public function getAliasesWithIDs() { $aliases = array(); $aliases[$this->getUri()] = $this->getID(); diff --git a/plugins/WebFinger/lib/webfingerresource.php b/plugins/WebFinger/lib/webfingerresource.php index 3afbd41713..b7bace36d2 100644 --- a/plugins/WebFinger/lib/webfingerresource.php +++ b/plugins/WebFinger/lib/webfingerresource.php @@ -31,7 +31,7 @@ abstract class WebFingerResource public function getAliases() { - $aliases = $this->object->getAliases(); + $aliases = $this->object->getAliasesWithIDs(); // Some sites have changed from http to https and still want // (because remote sites look for it) verify that they are still