aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--includes/ContentSecurityPolicy.php4
-rw-r--r--includes/GlobalFunctions.php2
-rw-r--r--includes/WebRequest.php4
-rw-r--r--includes/block/AbstractBlock.php2
-rw-r--r--includes/block/SystemBlock.php8
-rw-r--r--includes/gallery/ImageGalleryBase.php2
-rw-r--r--includes/gallery/TraditionalImageGallery.php2
-rw-r--r--includes/jobqueue/JobQueueFederated.php2
-rw-r--r--includes/jobqueue/JobRunner.php8
-rw-r--r--includes/libs/Cookie.php2
-rw-r--r--includes/page/Article.php2
-rw-r--r--includes/pager/TablePager.php2
-rw-r--r--includes/registration/ExtensionProcessor.php4
-rw-r--r--includes/session/SessionProvider.php2
-rw-r--r--includes/upload/UploadFromUrl.php4
15 files changed, 25 insertions, 25 deletions
diff --git a/includes/ContentSecurityPolicy.php b/includes/ContentSecurityPolicy.php
index d9d906dbe6a5..08751242bfd7 100644
--- a/includes/ContentSecurityPolicy.php
+++ b/includes/ContentSecurityPolicy.php
@@ -243,8 +243,8 @@ class ContentSecurityPolicy {
|| !in_array( 'data:', $defaultSrc )
|| !in_array( 'blob:', $defaultSrc )
) {
- // A future todo might be to make the whitelist options only
- // add all the whitelisted sites to the header, instead of
+ // A future todo might be to make the allow options only
+ // add all the allowed sites to the header, instead of
// allowing all (Assuming there is a small number of sites).
// For now, the external image feature disables the limits
// CSP puts on external images.
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 28c258435bd9..82d381e05777 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1472,7 +1472,7 @@ function wfClientAcceptsGzip( $force = false ) {
if ( $result === null || $force ) {
$result = false;
if ( isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) ) {
- # @todo FIXME: We may want to blacklist some broken browsers
+ # @todo FIXME: We may want to disallow some broken browsers
$m = [];
if ( preg_match(
'/\bgzip(?:;(q)=([0-9]+(?:\.[0-9]+)))?\b/',
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 541f4a3dd352..85d216eb1921 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -1166,10 +1166,10 @@ class WebRequest {
* been dropped, this function now returns true unconditionally.
*
* @deprecated since 1.35
- * @param array $extWhitelist
+ * @param array $extList
* @return bool
*/
- public function checkUrlExtension( $extWhitelist = [] ) {
+ public function checkUrlExtension( $extList = [] ) {
wfDeprecated( __METHOD__, '1.35' );
return true;
}
diff --git a/includes/block/AbstractBlock.php b/includes/block/AbstractBlock.php
index 76c55b3b5213..a09b9c1fd483 100644
--- a/includes/block/AbstractBlock.php
+++ b/includes/block/AbstractBlock.php
@@ -273,7 +273,7 @@ abstract class AbstractBlock {
/**
* Determine whether the block prevents a given right. A right
- * may be blacklisted or whitelisted, or determined from a
+ * may be allowed or disallowed, or determined from a
* property on the block object. For certain rights, the property
* may be overridden according to global configs.
*
diff --git a/includes/block/SystemBlock.php b/includes/block/SystemBlock.php
index 8667bbb399f3..e99d076f09fb 100644
--- a/includes/block/SystemBlock.php
+++ b/includes/block/SystemBlock.php
@@ -24,7 +24,7 @@ namespace MediaWiki\Block;
/**
* System blocks are temporary blocks that are created on enforcement (e.g.
- * from IP blacklists) and are not saved to the database. The target of a
+ * from IP lists) and are not saved to the database. The target of a
* system block is an IP address. System blocks do not give rise to
* autoblocks and are not tracked with cookies.
*
@@ -57,10 +57,10 @@ class SystemBlock extends AbstractBlock {
/**
* Get the system block type, if any. A SystemBlock can have the following types:
- * - 'proxy': the IP is blacklisted in $wgProxyList
- * - 'dnsbl': the IP is associated with a blacklisted domain in $wgDnsBlacklistUrls
+ * - 'proxy': the IP is listed in $wgProxyList
+ * - 'dnsbl': the IP is associated with a listed domain in $wgDnsBlacklistUrls
* - 'wgSoftBlockRanges': the IP is covered by $wgSoftBlockRanges
- * - 'global-block': for backwards compatability with the UserIsBlockedGlobally hook
+ * - 'global-block': for backwards compatibility with the UserIsBlockedGlobally hook
*
* @since 1.29
* @return string|null
diff --git a/includes/gallery/ImageGalleryBase.php b/includes/gallery/ImageGalleryBase.php
index ce7470e2e73e..ef5d18d749db 100644
--- a/includes/gallery/ImageGalleryBase.php
+++ b/includes/gallery/ImageGalleryBase.php
@@ -74,7 +74,7 @@ abstract class ImageGalleryBase extends ContextSource {
protected $mCaptionLength = true;
/**
- * @var bool Hide blacklisted images?
+ * @var bool Hide bad images?
*/
protected $mHideBadImages;
diff --git a/includes/gallery/TraditionalImageGallery.php b/includes/gallery/TraditionalImageGallery.php
index ff6d1384fe2c..cf141be149e3 100644
--- a/includes/gallery/TraditionalImageGallery.php
+++ b/includes/gallery/TraditionalImageGallery.php
@@ -118,7 +118,7 @@ class TraditionalImageGallery extends ImageGalleryBase {
} elseif ( $this->mHideBadImages &&
$badFileLookup->isBadFile( $nt->getDBkey(), $this->getContextTitle() )
) {
- # The image is blacklisted, just show it as a text link.
+ # The image is bad, so just show it as a text link.
$thumbhtml = "\n\t\t\t" . '<div class="thumb" style="height: ' .
( $this->getThumbPadding() + $this->mHeights ) . 'px;">' .
$linkRenderer->makeKnownLink( $nt, $nt->getText() ) .
diff --git a/includes/jobqueue/JobQueueFederated.php b/includes/jobqueue/JobQueueFederated.php
index 90e4086cd3a7..a73d6da487d7 100644
--- a/includes/jobqueue/JobQueueFederated.php
+++ b/includes/jobqueue/JobQueueFederated.php
@@ -289,7 +289,7 @@ class JobQueueFederated extends JobQueue {
return $job;
} else {
- unset( $partitionsTry[$partition] ); // blacklist partition
+ unset( $partitionsTry[$partition] );
}
}
$this->throwErrorIfAllPartitionsDown( $failed );
diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index c21686b49b7c..1cfa2f115d6d 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -218,17 +218,17 @@ class JobRunner implements LoggerAwareInterface {
do {
// Sync the persistent backoffs with concurrent runners
$backoffs = $this->syncBackoffDeltas( $backoffs, $backoffDeltas, $wait );
- $blacklist = $throttle ? array_keys( $backoffs ) : [];
+ $backoffKeys = $throttle ? array_keys( $backoffs ) : [];
$wait = 'nowait'; // less important now
if ( $type === false ) {
// Treat the default job type queues as a single queue and pop off a job
$job = $this->jobQueueGroup
- ->pop( JobQueueGroup::TYPE_DEFAULT, JobQueueGroup::USE_CACHE, $blacklist );
+ ->pop( JobQueueGroup::TYPE_DEFAULT, JobQueueGroup::USE_CACHE, $backoffKeys );
} else {
// Pop off a job from the specified job type queue unless the execution of
- // that type of job is currently rate-limited by the back-off blacklist
- $job = in_array( $type, $blacklist ) ? false : $this->jobQueueGroup->pop( $type );
+ // that type of job is currently rate-limited by the back-off list
+ $job = in_array( $type, $backoffKeys ) ? false : $this->jobQueueGroup->pop( $type );
}
if ( $job ) {
diff --git a/includes/libs/Cookie.php b/includes/libs/Cookie.php
index 1b25b5d44a4e..152a86eda19c 100644
--- a/includes/libs/Cookie.php
+++ b/includes/libs/Cookie.php
@@ -74,7 +74,7 @@ class Cookie {
* false. The uses a method similar to IE cookie security
* described here:
* http://kuza55.blogspot.com/2008/02/understanding-cookie-security.html
- * A better method might be to use a blacklist like
+ * A better method might be to use a list like
* http://publicsuffix.org/
*
* @todo fixme fails to detect 3-letter top-level domains
diff --git a/includes/page/Article.php b/includes/page/Article.php
index a421202a73ff..e0b9d5c27372 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -489,7 +489,7 @@ class Article implements Page {
$oldid = $this->getOldID();
$user = $this->getContext()->getUser();
- # Another whitelist check in case getOldID() is altering the title
+ # Another check in case getOldID() is altering the title
$permissionStatus = PermissionStatus::newEmpty();
if ( !$this->getContext()->getAuthority()
->authorizeRead( 'read', $this->getTitle(), $permissionStatus )
diff --git a/includes/pager/TablePager.php b/includes/pager/TablePager.php
index d2e4baec3440..bd0d9f126dfd 100644
--- a/includes/pager/TablePager.php
+++ b/includes/pager/TablePager.php
@@ -405,7 +405,7 @@ abstract class TablePager extends IndexPager {
/**
* Get \<input type="hidden"\> elements for use in a method="get" form.
* Resubmits all defined elements of the query string, except for a
- * blacklist, passed in the $blacklist parameter.
+ * exclusion list, passed in the $noResubmit parameter.
*
* @param array $noResubmit Parameters from the request query which should not be resubmitted
* @return string HTML fragment
diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index b2879b98ed38..90c466e46ec7 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -249,7 +249,7 @@ class ExtensionProcessor implements Processor {
}
if ( $version === 2 ) {
- // Only whitelisted attributes are set
+ // Only allowed attributes are set
if ( in_array( $key, self::CORE_ATTRIBS ) ) {
$this->storeToArray( $path, $key, $val, $this->attributes );
}
@@ -258,7 +258,7 @@ class ExtensionProcessor implements Processor {
if ( !in_array( $key, self::NOT_ATTRIBS )
&& !in_array( $key, self::CREDIT_ATTRIBS )
) {
- // If it's not blacklisted, it's an attribute
+ // If it's not disallowed, it's an attribute
$this->storeToArrayRecursive( $path, $key, $val, $this->attributes );
}
}
diff --git a/includes/session/SessionProvider.php b/includes/session/SessionProvider.php
index 7adce7fd9a8e..3395a3b3beee 100644
--- a/includes/session/SessionProvider.php
+++ b/includes/session/SessionProvider.php
@@ -401,7 +401,7 @@ abstract class SessionProvider implements SessionProviderInterface, LoggerAwareI
* If the provider is capable of returning a SessionInfo with a verified
* UserInfo for the named user in some manner other than by validating
* against $user->getToken(), steps must be taken to prevent that from
- * occurring in the future. This might add the username to a blacklist, or
+ * occurring in the future. This might add the username to a list, or
* it might just delete whatever authentication credentials would allow
* such a session in the first place (e.g. remove all OAuth grants or
* delete record of the SSL client certificate).
diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php
index 29650735c3b9..fee03d8b7a9f 100644
--- a/includes/upload/UploadFromUrl.php
+++ b/includes/upload/UploadFromUrl.php
@@ -68,7 +68,7 @@ class UploadFromUrl extends UploadBase {
/**
* Checks whether the URL is for an allowed host
- * The domains in the whitelist can include wildcard characters (*) in place
+ * The domains in the allowlist can include wildcard characters (*) in place
* of any of the domain levels, e.g. '*.flickr.com' or 'upload.*.gov.uk'.
*
* @param string $url
@@ -85,7 +85,7 @@ class UploadFromUrl extends UploadBase {
}
$valid = false;
foreach ( $wgCopyUploadsDomains as $domain ) {
- // See if the domain for the upload matches this whitelisted domain
+ // See if the domain for the upload matches this allowed domain
$domainPieces = explode( '.', $domain );
$uploadDomainPieces = explode( '.', $parsedUrl['host'] );
if ( count( $domainPieces ) === count( $uploadDomainPieces ) ) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 18:46:31 +0000