Merge "Pass $context to 'GetPreferences' hook"

[lhc/web/wiklou.git] / includes / preferences / DefaultPreferencesFactory.php

diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php
index 08f3c6b..c552506 100644 (file)
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@ -267,11 +267,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                                continue;
                        }
 
-                       if ( isset( $userGroupMemberships[$ueg] ) ) {
-                               $groupStringOrObject = $userGroupMemberships[$ueg];
-                       } else {
-                               $groupStringOrObject = $ueg;
-                       }
+                       $groupStringOrObject = $userGroupMemberships[$ueg] ?? $ueg;
 
                        $userG = UserGroupMembership::getLink( $groupStringOrObject, $context, 'html' );
                        $userM = UserGroupMembership::getLink( $groupStringOrObject, $context, 'html',
@@ -467,7 +463,9 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                        $user,
                        ParserOptions::newFromContext( $context )
                );
-               $oldsigHTML = $context->getOutput()->parseInline( $oldsigWikiText, true, true );
+               $oldsigHTML = Parser::stripOuterParagraph(
+                       $context->getOutput()->parseAsContent( $oldsigWikiText )
+               );
                $defaultPreferences['oldsig'] = [
                        'type' => 'info',
                        'raw' => true,