From 268b901048155bff5b6c076b05d4a6d2d6242d40 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 6 Jun 2015 15:58:08 +0200 Subject: [PATCH] Maintainer change for Ostatus_profile --- plugins/OStatus/classes/Ostatus_profile.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 4d1b95e2b7..cb961dc96b 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -17,13 +17,12 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { - exit(1); -} +if (!defined('GNUSOCIAL')) { exit(1); } /** * @package OStatusPlugin - * @maintainer Brion Vibber + * @author Brion Vibber + * @maintainer Mikael Nordfeldth */ class Ostatus_profile extends Managed_DataObject { @@ -1746,11 +1745,8 @@ class Ostatus_profile extends Managed_DataObject throw new Exception(_m('Not a valid webfinger address.')); } - $hints = array('webfinger' => $addr); - - $dhints = DiscoveryHints::fromXRD($xrd); - - $hints = array_merge($hints, $dhints); + $hints = array_merge(array('webfinger' => $addr), + DiscoveryHints::fromXRD($xrd)); // If there's an Hcard, let's grab its info if (array_key_exists('hcard', $hints)) { -- 2.39.5