Merge "Followup I4049b666: "Removing prefix exception for HTMLCheckMatrix""

[lhc/web/wiklou.git] / includes / specials / SpecialVersion.php

diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php
index 8ca9e23..318ceb1 100644 (file)
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -212,7 +212,7 @@ class SpecialVersion extends SpecialPage {
                $software = array();
                $software['[https://www.mediawiki.org/ MediaWiki]'] = self::getVersionLinked();
                $phpKey = wfIsHHVM() ? '[http://hhvm.com/ HHVM]' :
-                       '[http://www.php.net/ PHP]';
+                       '[https://php.net/ PHP]';
                $software[$phpKey] = PHP_VERSION . " (" . PHP_SAPI . ")";
                $software[$dbr->getSoftwareLink()] = $dbr->getServerInfo();
 
@@ -428,7 +428,11 @@ class SpecialVersion extends SpecialPage {
        function getExtensionCredits() {
                global $wgExtensionCredits;
 
-               if ( !count( $wgExtensionCredits ) ) {
+               if (
+                       count( $wgExtensionCredits ) === 0 ||
+                       // Skins are displayed separately, see getSkinCredits()
+                       ( count( $wgExtensionCredits ) === 1 && isset( $wgExtensionCredits['skin'] ) )
+               ) {
                        return '';
                }
 
@@ -476,6 +480,11 @@ class SpecialVersion extends SpecialPage {
         * @return string Wikitext
         */
        function getSkinCredits() {
+               global $wgExtensionCredits;
+               if ( !isset( $wgExtensionCredits['skin'] ) || count( $wgExtensionCredits['skin'] ) === 0 ) {
+                       return '';
+               }
+
                $out = Xml::element(
                                'h2',
                                array( 'id' => 'mw-version-skin' ),