build: Updating mediawiki/mediawiki-codesniffer to 14.1.0

[lhc/web/wiklou.git] / includes / skins / SkinTemplate.php

diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 180a6df..532ee51 100644 (file)
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -174,7 +174,7 @@ class SkinTemplate extends Skin {
                                        )->text();
                                }
 
-                               $ilInterwikiCodeBCP47 = wfBCP47( $ilInterwikiCode );
+                               $ilInterwikiCodeBCP47 = LanguageCode::bcp47( $ilInterwikiCode );
                                $languageLink = [
                                        'href' => $languageLinkTitle->getFullURL(),
                                        'text' => $ilLangName,
@@ -729,7 +729,7 @@ class SkinTemplate extends Skin {
                        }
                }
 
-               Hooks::run( 'PersonalUrls', [ &$personal_urls, &$title, $this ] );
+               Hooks::runWithoutAbort( 'PersonalUrls', [ &$personal_urls, &$title, $this ] );
                return $personal_urls;
        }
 
@@ -811,6 +811,9 @@ class SkinTemplate extends Skin {
 
        /**
         * @todo is this even used?
+        * @param string $name
+        * @param string $urlaction
+        * @return array
         */
        function makeArticleUrlDetails( $name, $urlaction = '' ) {
                $title = Title::newFromText( $name );
@@ -1092,7 +1095,10 @@ class SkinTemplate extends Skin {
 
                        // Avoid PHP 7.1 warning of passing $this by reference
                        $skinTemplate = $this;
-                       Hooks::run( 'SkinTemplateNavigation', [ &$skinTemplate, &$content_navigation ] );
+                       Hooks::runWithoutAbort(
+                               'SkinTemplateNavigation',
+                               [ &$skinTemplate, &$content_navigation ]
+                       );
 
                        if ( $userCanRead && !$wgDisableLangConversion ) {
                                $pageLang = $title->getPageLanguage();
@@ -1119,8 +1125,8 @@ class SkinTemplate extends Skin {
                                                        'class' => ( $code == $preferred ) ? 'selected' : false,
                                                        'text' => $varname,
                                                        'href' => $title->getLocalURL( [ 'variant' => $code ] + $params ),
-                                                       'lang' => wfBCP47( $code ),
-                                                       'hreflang' => wfBCP47( $code ),
+                                                       'lang' => LanguageCode::bcp47( $code ),
+                                                       'hreflang' => LanguageCode::bcp47( $code ),
                                                ];
                                        }
                                }
@@ -1136,14 +1142,15 @@ class SkinTemplate extends Skin {
 
                        // Avoid PHP 7.1 warning of passing $this by reference
                        $skinTemplate = $this;
-                       Hooks::run( 'SkinTemplateNavigation::SpecialPage',
+                       Hooks::runWithoutAbort( 'SkinTemplateNavigation::SpecialPage',
                                [ &$skinTemplate, &$content_navigation ] );
                }
 
                // Avoid PHP 7.1 warning of passing $this by reference
                $skinTemplate = $this;
                // Equiv to SkinTemplateContentActions
-               Hooks::run( 'SkinTemplateNavigation::Universal', [ &$skinTemplate, &$content_navigation ] );
+               Hooks::runWithoutAbort( 'SkinTemplateNavigation::Universal',
+                       [ &$skinTemplate, &$content_navigation ] );
 
                // Setup xml ids and tooltip info
                foreach ( $content_navigation as $section => &$links ) {