From 1ba0445c127d4b152509db0d4450d29506f29b9d Mon Sep 17 00:00:00 2001
From: Ladsgroup
Date: Wed, 12 Mar 2014 22:30:35 +0000
Subject: [PATCH] Changing URLs of mediawiki.org in scripts to the SSL-based
website
http://www.mediawiki.org --> https://www.mediawiki.org
Part 2
Change-Id: I3be61fe3dfb502cc20180486eb1a8016eac151df
---
img_auth.php | 2 +-
includes/AuthPlugin.php | 2 +-
includes/DefaultSettings.php | 16 ++++++++--------
includes/Export.php | 2 +-
includes/Feed.php | 2 +-
includes/Import.php | 2 +-
includes/PHPVersionError.php | 4 ++--
includes/ProtectionForm.php | 2 +-
includes/Sanitizer.php | 2 +-
includes/WebRequest.php | 2 +-
includes/WikiMap.php | 2 +-
includes/db/CloneDatabase.php | 2 +-
includes/htmlform/HTMLForm.php | 4 ++--
includes/installer/InstallDocFormatter.php | 2 +-
includes/installer/LocalSettingsGenerator.php | 4 ++--
includes/installer/WebInstallerOutput.php | 2 +-
.../installer/InstallDocFormatterTest.php | 6 +++---
17 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/img_auth.php b/img_auth.php
index 72a7dab855..7765dd3cc6 100644
--- a/img_auth.php
+++ b/img_auth.php
@@ -2,7 +2,7 @@
/**
* Image authorisation script
*
- * To use this, see http://www.mediawiki.org/wiki/Manual:Image_Authorization
+ * To use this, see https://www.mediawiki.org/wiki/Manual:Image_Authorization
*
* - Set $wgUploadDirectory to a non-public directory (not web accessible)
* - Set $wgUploadPath to point to this file
diff --git a/includes/AuthPlugin.php b/includes/AuthPlugin.php
index c7b0c977cc..217744e47e 100644
--- a/includes/AuthPlugin.php
+++ b/includes/AuthPlugin.php
@@ -3,7 +3,7 @@
* Authentication plugin interface
*
* Copyright © 2004 Brion Vibber
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 28f37d25ed..50db6c7212 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -15,7 +15,7 @@
* performed in LocalSettings.php.
*
* Documentation is in the source and on:
- * http://www.mediawiki.org/wiki/Manual:Configuration_settings
+ * https://www.mediawiki.org/wiki/Manual:Configuration_settings
*
* @warning Note: this (and other things) will break if the autoloader is not
* enabled. Please include includes/AutoLoader.php before including this file.
@@ -2256,7 +2256,7 @@ $wgInvalidateCacheOnLocalSettingsChange = true;
* although they are referred to as Squid settings for historical reasons.
*
* Achieving a high hit ratio with an HTTP proxy requires special
- * configuration. See http://www.mediawiki.org/wiki/Manual:Squid_caching for
+ * configuration. See https://www.mediawiki.org/wiki/Manual:Squid_caching for
* more details.
*
* @{
@@ -2264,7 +2264,7 @@ $wgInvalidateCacheOnLocalSettingsChange = true;
/**
* Enable/disable Squid.
- * See http://www.mediawiki.org/wiki/Manual:Squid_caching
+ * See https://www.mediawiki.org/wiki/Manual:Squid_caching
*/
$wgUseSquid = false;
@@ -3927,7 +3927,7 @@ $wgTranscludeCacheExpiry = 3600;
* if $wgUseCommaCount is false, it will be 'link', if it is true
* it will be 'comma'
*
- * See also See http://www.mediawiki.org/wiki/Manual:Article_count
+ * See also See https://www.mediawiki.org/wiki/Manual:Article_count
*
* Retroactively changing this variable will not affect the existing count,
* to update it, you will need to run the maintenance/updateArticleCount.php
@@ -4173,7 +4173,7 @@ $wgBlockDisablesLogin = false;
*
* @note Also that this will only protect _pages in the wiki_. Uploaded files
* will remain readable. You can use img_auth.php to protect uploaded files,
- * see http://www.mediawiki.org/wiki/Manual:Image_Authorization
+ * see https://www.mediawiki.org/wiki/Manual:Image_Authorization
*/
$wgWhitelistRead = false;
@@ -4910,7 +4910,7 @@ $wgUseTeX = false;
*/
/**
- * Filename for debug logging. See http://www.mediawiki.org/wiki/How_to_debug
+ * Filename for debug logging. See https://www.mediawiki.org/wiki/How_to_debug
* The debug log file should be not be publicly accessible if it is used, as it
* may contain private data.
*/
@@ -5197,7 +5197,7 @@ $wgParserTestFiles = array(
*
* Something like this:
* $wgParserTestRemote = array(
- * 'api-url' => 'http://www.mediawiki.org/w/api.php',
+ * 'api-url' => 'https://www.mediawiki.org/w/api.php',
* 'repo' => 'MediaWiki',
* 'suite' => 'ParserTests',
* 'path' => '/trunk/phase3', // not used client-side; for reference
@@ -6605,7 +6605,7 @@ $wgExemptFromUserRobotsControl = null;
* Enable the MediaWiki API for convenient access to
* machine-readable data via api.php
*
- * See http://www.mediawiki.org/wiki/API
+ * See https://www.mediawiki.org/wiki/API
*/
$wgEnableAPI = true;
diff --git a/includes/Export.php b/includes/Export.php
index 639ba28943..56fe452587 100644
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -3,7 +3,7 @@
* Base classes for dumps and export
*
* Copyright © 2003, 2005, 2006 Brion Vibber
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/Feed.php b/includes/Feed.php
index 635b04e4d4..d5a95535f3 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -6,7 +6,7 @@
* Available feeds are defined in Defines.php
*
* Copyright © 2004 Brion Vibber
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/Import.php b/includes/Import.php
index e447e47561..b18e25716a 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -3,7 +3,7 @@
* MediaWiki page data importer.
*
* Copyright © 2003,2005 Brion Vibber
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/PHPVersionError.php b/includes/PHPVersionError.php
index e6d6ebf92d..60aa33c07c 100644
--- a/includes/PHPVersionError.php
+++ b/includes/PHPVersionError.php
@@ -97,9 +97,9 @@ function wfPHPVersionError( $type ) {
If for some reason you are unable to upgrade your PHP version, you will need to
- download an older version
+ download an older version
of MediaWiki from our website. See our
- compatibility page
+ compatibility page
for details of which versions are compatible with prior versions of PHP.
diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index d6cc8a3835..bcb88e9fa7 100644
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -3,7 +3,7 @@
* Page protection
*
* Copyright © 2005 Brion Vibber
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 0de8cda4c8..90548fe076 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -3,7 +3,7 @@
* HTML sanitizer for %MediaWiki.
*
* Copyright © 2002-2005 Brion Vibber et al
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 399facf184..01366f4310 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -3,7 +3,7 @@
* Deal with importing all those nasty globals and things
*
* Copyright © 2003 Brion Vibber
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/WikiMap.php b/includes/WikiMap.php
index da4416de31..473975389b 100644
--- a/includes/WikiMap.php
+++ b/includes/WikiMap.php
@@ -127,7 +127,7 @@ class WikiMap {
class WikiReference {
private $mMinor; ///< 'en', 'meta', 'mediawiki', etc
private $mMajor; ///< 'wiki', 'wiktionary', etc
- private $mCanonicalServer; ///< canonical server URL, e.g. 'http://www.mediawiki.org'
+ private $mCanonicalServer; ///< canonical server URL, e.g. 'https://www.mediawiki.org'
private $mServer; ///< server URL, may be protocol-relative, e.g. '//www.mediawiki.org'
private $mPath; ///< path, '/wiki/$1'
diff --git a/includes/db/CloneDatabase.php b/includes/db/CloneDatabase.php
index c5dc882e10..08e1885867 100644
--- a/includes/db/CloneDatabase.php
+++ b/includes/db/CloneDatabase.php
@@ -3,7 +3,7 @@
* Helper class for making a copy of the database, mostly for unit testing.
*
* Copyright © 2010 Chad Horohoe
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index f4b16cc5f4..21505a8ad3 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -36,8 +36,8 @@
* the HTML for the input field to be placed in the table.
*
* You can find extensive documentation on the www.mediawiki.org wiki:
- * - http://www.mediawiki.org/wiki/HTMLForm
- * - http://www.mediawiki.org/wiki/HTMLForm/tutorial
+ * - https://www.mediawiki.org/wiki/HTMLForm
+ * - https://www.mediawiki.org/wiki/HTMLForm/tutorial
*
* The constructor input is an associative array of $fieldname => $info,
* where $info is an Associative Array with any of the following:
diff --git a/includes/installer/InstallDocFormatter.php b/includes/installer/InstallDocFormatter.php
index 6d3819cd42..3250ff8a3a 100644
--- a/includes/installer/InstallDocFormatter.php
+++ b/includes/installer/InstallDocFormatter.php
@@ -62,7 +62,7 @@ class InstallDocFormatter {
}
protected function replaceConfigLinks( $matches ) {
- return '[http://www.mediawiki.org/wiki/Manual:' .
+ return '[https://www.mediawiki.org/wiki/Manual:' .
$matches[1] . ' ' . $matches[1] . ']';
}
}
diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index 77c35b85ad..fe036adba9 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -264,7 +264,7 @@ class LocalSettingsGenerator {
# file, not there.
#
# Further documentation for configuration settings may be found at:
-# http://www.mediawiki.org/wiki/Manual:Configuration_settings
+# https://www.mediawiki.org/wiki/Manual:Configuration_settings
# Protect against web entry
if ( !defined( 'MEDIAWIKI' ) ) {
@@ -280,7 +280,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
## defaults for all runtime URL paths are based off of this.
## For more information on customizing the URLs
## (like /w/index.php/Page_title to /wiki/Page_title) please see:
-## http://www.mediawiki.org/wiki/Manual:Short_URL
+## https://www.mediawiki.org/wiki/Manual:Short_URL
\$wgScriptPath = \"{$this->values['wgScriptPath']}\";
\$wgScriptExtension = \"{$this->values['wgScriptExtension']}\";
${serverSetting}
diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index 25634baf68..e05a3d4d3e 100644
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -306,7 +306,7 @@ class WebInstallerOutput {
diff --git a/tests/phpunit/includes/installer/InstallDocFormatterTest.php b/tests/phpunit/includes/installer/InstallDocFormatterTest.php
index 0e5f2671bd..8466684108 100644
--- a/tests/phpunit/includes/installer/InstallDocFormatterTest.php
+++ b/tests/phpunit/includes/installer/InstallDocFormatterTest.php
@@ -48,13 +48,13 @@ class InstallDocFormatterTest extends MediaWikiTestCase {
# Transform '$wgFooBar' links
array(
- '[http://www.mediawiki.org/wiki/Manual:$wgFooBar $wgFooBar]',
+ '[https://www.mediawiki.org/wiki/Manual:$wgFooBar $wgFooBar]',
'$wgFooBar', 'Testing basic $wgFooBar' ),
array(
- '[http://www.mediawiki.org/wiki/Manual:$wgFooBar45 $wgFooBar45]',
+ '[https://www.mediawiki.org/wiki/Manual:$wgFooBar45 $wgFooBar45]',
'$wgFooBar45', 'Testing $wgFooBar45 (with numbers)' ),
array(
- '[http://www.mediawiki.org/wiki/Manual:$wgFoo_Bar $wgFoo_Bar]',
+ '[https://www.mediawiki.org/wiki/Manual:$wgFoo_Bar $wgFoo_Bar]',
'$wgFoo_Bar', 'Testing $wgFoo_Bar (with underscore)' ),
# Icky variables that shouldn't link
--
2.20.1