<exclude name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures" />
<exclude name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
<exclude name="MediaWiki.Usage.DbrQueryUsage.DbrQueryFound" />
+ <exclude name="MediaWiki.Usage.DeprecatedGlobalVariables.Deprecated$wgAuth" />
+ <exclude name="MediaWiki.Usage.DeprecatedGlobalVariables.Deprecated$wgContLang" />
+ <exclude name="MediaWiki.Usage.DeprecatedGlobalVariables.Deprecated$wgParser" />
+ <exclude name="MediaWiki.Usage.DeprecatedGlobalVariables.Deprecated$wgTitle" />
<exclude name="MediaWiki.Usage.ForbiddenFunctions.passthru" />
- <exclude name="MediaWiki.VariableAnalysis.ForbiddenGlobalVariables.ForbiddenGlobal$wgTitle" />
<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment" />
<exclude name="Squiz.Scope.MethodScope.Missing" />
<exclude-pattern>*/includes/specials/forms/PreferencesFormLegacy\.php</exclude-pattern>
<exclude-pattern>*/includes/specials/SpecialListusers\.php</exclude-pattern>
<exclude-pattern>*/includes/specials/SpecialMyRedirectPages\.php</exclude-pattern>
- <exclude-pattern>*/includes/specials/SpecialUploadStash\.php</exclude-pattern>
<exclude-pattern>*/includes/StubObject\.php</exclude-pattern>
- <exclude-pattern>*/includes/upload/UploadFromChunks\.php</exclude-pattern>
<exclude-pattern>*/includes/upload/UploadStash\.php</exclude-pattern>
<exclude-pattern>*/includes/utils/AutoloadGenerator\.php</exclude-pattern>
<exclude-pattern>*/includes/WebResponse\.php</exclude-pattern>
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-karma' );
grunt.loadNpmTasks( 'grunt-stylelint' );
+ grunt.loadNpmTasks( 'grunt-svgmin' );
karmaProxy[ wgScriptPath ] = {
target: wgServer + wgScriptPath,
stylelint: {
src: '{resources/src,mw-config}/**/*.{css,less}'
},
+ svgmin: {
+ options: {
+ js2svg: {
+ indent: '\t',
+ pretty: true
+ },
+ multipass: true,
+ plugins: [ {
+ cleanupIDs: false
+ }, {
+ removeDesc: false
+ }, {
+ removeRasterImages: true
+ }, {
+ removeTitle: false
+ }, {
+ removeViewBox: false
+ }, {
+ removeXMLProcInst: false
+ }, {
+ sortAttrs: true
+ } ]
+ },
+ all: {
+ files: [ {
+ expand: true,
+ cwd: 'resources/src',
+ src: [
+ '**/*.svg'
+ ],
+ dest: 'resources/src/',
+ ext: '.svg'
+ } ]
+ }
+ },
watch: {
files: [
'.{stylelintrc,eslintrc.json}',
return !!( process.env.MW_SERVER && process.env.MW_SCRIPT_PATH );
} );
+ grunt.registerTask( 'minify', 'svgmin' );
grunt.registerTask( 'lint', [ 'eslint', 'banana', 'stylelint' ] );
grunt.registerTask( 'qunit', [ 'assert-mw-env', 'karma:main' ] );
grunt.registerTask( 'test', [ 'lint' ] );
- grunt.registerTask( 'default', 'test' );
+ grunt.registerTask( 'default', [ 'minify', 'test' ] );
};
IP addresses, internationalized domain names, and possibly mailto links.
* (T193868) $wgChangeTagsSchemaMigrationStage — This temporary setting, added in
MediaWiki 1.32, now defaults to MIGRATION_NEW instead of MIGRATION_WRITE_BOTH.
+* Special:ActiveUsers will no longer filter out users who became inactive since
+ the last time the active users query cache was updated.
==== Removed configuration ====
* (T199334) $wgTagStatisticsNewTable — This temporary setting, added in
* $wgEnableParserCache, deprecated since 1.26, was removed.
If disabling the parser cache is still desirable,
set `$wgParserCacheType = CACHE_NONE;` instead.
+* $wgCommentTableSchemaMigrationStage has been removed. Extension code finding
+ it unset should treat it as being MIGRATION_NEW.
=== New features in 1.33 ===
* (T96041) __EXPECTUNUSEDCATEGORY__ on a category page causes the category
Content::getNativeData() for text-based content models.
* (T210814) SVGs are now by default displayed in wiki language on image
pages.
+* (T214706) LinksUpdate::getAddedExternalLinks() and
+ LinksUpdate::getRemovedExternalLinks() were introduced.
=== External library changes in 1.33 ===
'SpecialUnlockdb' => __DIR__ . '/includes/specials/SpecialUnlockdb.php',
'SpecialUpload' => __DIR__ . '/includes/specials/SpecialUpload.php',
'SpecialUploadStash' => __DIR__ . '/includes/specials/SpecialUploadStash.php',
- 'SpecialUploadStashTooLargeException' => __DIR__ . '/includes/specials/SpecialUploadStash.php',
+ 'SpecialUploadStashTooLargeException' => __DIR__ . '/includes/specials/exception/SpecialUploadStashTooLargeException.php',
'SpecialUserLogin' => __DIR__ . '/includes/specials/SpecialUserLogin.php',
'SpecialUserLogout' => __DIR__ . '/includes/specials/SpecialUserLogout.php',
'SpecialVersion' => __DIR__ . '/includes/specials/SpecialVersion.php',
'UpdateSearchIndex' => __DIR__ . '/maintenance/updateSearchIndex.php',
'UpdateSpecialPages' => __DIR__ . '/maintenance/updateSpecialPages.php',
'UploadBase' => __DIR__ . '/includes/upload/UploadBase.php',
- 'UploadChunkFileException' => __DIR__ . '/includes/upload/UploadFromChunks.php',
- 'UploadChunkVerificationException' => __DIR__ . '/includes/upload/UploadFromChunks.php',
- 'UploadChunkZeroLengthFileException' => __DIR__ . '/includes/upload/UploadFromChunks.php',
+ 'UploadChunkFileException' => __DIR__ . '/includes/upload/exception/UploadChunkFileException.php',
+ 'UploadChunkVerificationException' => __DIR__ . '/includes/upload/exception/UploadChunkVerificationException.php',
+ 'UploadChunkZeroLengthFileException' => __DIR__ . '/includes/upload/exception/UploadChunkZeroLengthFileException.php',
'UploadForm' => __DIR__ . '/includes/specials/forms/UploadForm.php',
'UploadFromChunks' => __DIR__ . '/includes/upload/UploadFromChunks.php',
'UploadFromFile' => __DIR__ . '/includes/upload/UploadFromFile.php',
'UploadSourceAdapter' => __DIR__ . '/includes/import/UploadSourceAdapter.php',
'UploadSourceField' => __DIR__ . '/includes/specials/formfields/UploadSourceField.php',
'UploadStash' => __DIR__ . '/includes/upload/UploadStash.php',
- 'UploadStashBadPathException' => __DIR__ . '/includes/upload/UploadStash.php',
- 'UploadStashException' => __DIR__ . '/includes/upload/UploadStash.php',
+ 'UploadStashBadPathException' => __DIR__ . '/includes/upload/exception/UploadStashBadPathException.php',
+ 'UploadStashException' => __DIR__ . '/includes/upload/exception/UploadStashException.php',
'UploadStashFile' => __DIR__ . '/includes/upload/UploadStash.php',
- 'UploadStashFileException' => __DIR__ . '/includes/upload/UploadStash.php',
- 'UploadStashFileNotFoundException' => __DIR__ . '/includes/upload/UploadStash.php',
- 'UploadStashNoSuchKeyException' => __DIR__ . '/includes/upload/UploadStash.php',
- 'UploadStashNotLoggedInException' => __DIR__ . '/includes/upload/UploadStash.php',
- 'UploadStashWrongOwnerException' => __DIR__ . '/includes/upload/UploadStash.php',
- 'UploadStashZeroLengthFileException' => __DIR__ . '/includes/upload/UploadStash.php',
+ 'UploadStashFileException' => __DIR__ . '/includes/upload/exception/UploadStashFileException.php',
+ 'UploadStashFileNotFoundException' => __DIR__ . '/includes/upload/exception/UploadStashFileNotFoundException.php',
+ 'UploadStashNoSuchKeyException' => __DIR__ . '/includes/upload/exception/UploadStashNoSuchKeyException.php',
+ 'UploadStashNotLoggedInException' => __DIR__ . '/includes/upload/exception/UploadStashNotLoggedInException.php',
+ 'UploadStashWrongOwnerException' => __DIR__ . '/includes/upload/exception/UploadStashWrongOwnerException.php',
+ 'UploadStashZeroLengthFileException' => __DIR__ . '/includes/upload/exception/UploadStashZeroLengthFileException.php',
'UppercaseCollation' => __DIR__ . '/includes/collation/UppercaseCollation.php',
'User' => __DIR__ . '/includes/user/User.php',
'UserArray' => __DIR__ . '/includes/user/UserArray.php',
"jakub-onderka/php-parallel-lint": "0.9.2",
"jetbrains/phpstorm-stubs": "dev-master#38ff1a581b297f7901e961b8c923862ea80c3b96",
"justinrainbow/json-schema": "~5.2",
- "mediawiki/mediawiki-codesniffer": "23.0.0",
+ "mediawiki/mediawiki-codesniffer": "24.0.0",
"monolog/monolog": "~1.22.1",
"nikic/php-parser": "3.1.3",
"seld/jsonlint": "1.7.1",
require_once __DIR__ . '/../autoload.php';
class AutoLoader {
- static protected $autoloadLocalClassesLower = null;
+ protected static $autoloadLocalClassesLower = null;
/**
* @private Only public for ExtensionRegistry
* @var string[] Namespace (ends with \) => Path (ends with /)
*/
- static public $psr4Namespaces = [];
+ public static $psr4Namespaces = [];
/**
* autoload - take a class name and attempt to load it
case 'read':
$res = false;
break;
+ case 'purge':
+ $res = false;
+ break;
}
if ( !$res && $blockDisablesLogin ) {
// If a block would disable login, then it should
*/
protected $key = null;
- /** @var int One of the MIGRATION_* constants */
+ /**
+ * @var int One of the MIGRATION_* constants
+ * @todo Deprecate and remove once extensions seem unlikely to need to use
+ * it for migration anymore.
+ */
protected $stage;
/** @var array[] Cache for `self::getJoin()` */
/**
* @param Language $lang Language to use for comment truncation. Defaults
* to content language.
- * @param int $migrationStage One of the MIGRATION_* constants
+ * @param int $migrationStage One of the MIGRATION_* constants. Always
+ * MIGRATION_NEW for MediaWiki core since 1.33.
*/
public function __construct( Language $lang, $migrationStage ) {
$this->stage = $migrationStage;
* @return CommentStore
*/
public static function newKey( $key ) {
- global $wgCommentTableSchemaMigrationStage;
wfDeprecated( __METHOD__, '1.31' );
- $store = new CommentStore( MediaWikiServices::getInstance()->getContentLanguage(),
- $wgCommentTableSchemaMigrationStage );
+ $store = new CommentStore(
+ MediaWikiServices::getInstance()->getContentLanguage(), MIGRATION_NEW
+ );
$store->key = $key;
return $store;
}
*/
$wgInterwikiPrefixDisplayTypes = [];
-/**
- * Comment table schema migration stage.
- * @since 1.30
- * @var int One of the MIGRATION_* constants
- */
-$wgCommentTableSchemaMigrationStage = MIGRATION_NEW;
-
/**
* RevisionStore table schema migration stage (content, slots, content_models & slot_roles tables).
* Use the SCHEMA_COMPAT_XXX flags. Supported values:
* @return array
*/
private function getSummaryInputAttributes( array $inputAttrs = null ) {
- $conf = $this->context->getConfig();
- $oldCommentSchema = $conf->get( 'CommentTableSchemaMigrationStage' ) === MIGRATION_OLD;
// HTML maxlength uses "UTF-16 code units", which means that characters outside BMP
// (e.g. emojis) count for two each. This limit is overridden in JS to instead count
- // Unicode codepoints (or 255 UTF-8 bytes for old schema).
+ // Unicode codepoints.
return ( is_array( $inputAttrs ) ? $inputAttrs : [] ) + [
'id' => 'wpSummary',
'name' => 'wpSummary',
- 'maxlength' => $oldCommentSchema ? 200 : CommentStore::COMMENT_CHARACTER_LIMIT,
+ 'maxlength' => CommentStore::COMMENT_CHARACTER_LIMIT,
'tabindex' => 1,
'size' => 60,
'spellcheck' => 'true',
private function showForm() {
global $wgOut, $wgUser, $wgRequest;
- $conf = RequestContext::getMain()->getConfig();
- $oldCommentSchema = $conf->get( 'CommentTableSchemaMigrationStage' ) === MIGRATION_OLD;
-
$wgOut->addModules( 'mediawiki.action.delete.file' );
$checkWatch = $wgUser->getBoolOption( 'watchdeletion' ) || $wgUser->isWatched( $this->title );
// HTML maxlength uses "UTF-16 code units", which means that characters outside BMP
// (e.g. emojis) count for two each. This limit is overridden in JS to instead count
- // Unicode codepoints (or 255 UTF-8 bytes for old schema).
+ // Unicode codepoints.
$fields[] = new OOUI\FieldLayout(
new OOUI\TextInputWidget( [
'name' => 'wpReason',
'inputId' => 'wpReason',
'tabIndex' => 2,
- 'maxLength' => $oldCommentSchema ? 255 : CommentStore::COMMENT_CHARACTER_LIMIT,
+ 'maxLength' => CommentStore::COMMENT_CHARACTER_LIMIT,
'infusable' => true,
'value' => $wgRequest->getText( 'wpReason' ),
'autofocus' => true,
* @return bool Whether or not the string looks like a SHA1
*/
public static function isSHA1( $str ) {
- return !!preg_match( '/^[0-9A-F]{40}$/i', $str );
+ return (bool)preg_match( '/^[0-9A-F]{40}$/i', $str );
}
/**
function wfCanIPUseHTTPS( $ip ) {
$canDo = true;
Hooks::run( 'CanIPUseHTTPS', [ $ip, &$canDo ] );
- return !!$canDo;
+ return (bool)$canDo;
}
/**
* Move a file associated with a page to a new location.
* Can also be used to revert after a DB failure.
*
- * @access private
+ * @private
* @param Title Old location to move the file from.
* @param Title New location to move the file to.
* @return Status
$lang = $context->getLanguage();
$conf = $context->getConfig();
$cascadingRestrictionLevels = $conf->get( 'CascadingRestrictionLevels' );
- $oldCommentSchema = $conf->get( 'CommentTableSchemaMigrationStage' ) === MIGRATION_OLD;
$out = '';
if ( !$this->disabled ) {
$output->addModules( 'mediawiki.legacy.protect' );
// HTML maxlength uses "UTF-16 code units", which means that characters outside BMP
// (e.g. emojis) count for two each. This limit is overridden in JS to instead count
- // Unicode codepoints (or 180 UTF-8 bytes for old schema).
+ // Unicode codepoints.
// Subtract arbitrary 75 to leave some space for the autogenerated null edit's summary
// and other texts chosen by dropdown menus on this page.
- $maxlength = $oldCommentSchema ? 180 : CommentStore::COMMENT_CHARACTER_LIMIT - 75;
+ $maxlength = CommentStore::COMMENT_CHARACTER_LIMIT - 75;
$out .= Xml::openElement( 'table', [ 'id' => 'mw-protect-table3' ] ) .
Xml::openElement( 'tbody' );
* Show protection long extracts for this page
*
* @param OutputPage &$out
- * @access private
+ * @private
*/
function showLogExtract( &$out ) {
# Show relevant lines from the protection log:
* @param int $queryFlags
* @param Title|null $title
*
- * @access private
+ * @private
*/
function __construct( $row, $queryFlags = 0, Title $title = null ) {
global $wgUser;
'CommentStore' => function ( MediaWikiServices $services ) : CommentStore {
return new CommentStore(
$services->getContentLanguage(),
- $services->getMainConfig()->get( 'CommentTableSchemaMigrationStage' )
+ MIGRATION_NEW
);
},
*/
class Title implements LinkTarget, IDBAccessObject {
/** @var MapCacheLRU */
- static private $titleCache = null;
+ private static $titleCache = null;
/**
* Title::newFromText maintains a cache to avoid expensive re-normalization of
}
/**
- * @access protected
+ * @protected
*/
function __construct() {
}
}
// Determine if the user is blocked from this action on this page.
- // What gets passed into this method is a user right, not an action nmae.
+ // What gets passed into this method is a user right, not an action name.
// There is no way to instantiate an action by restriction. However, this
// will get the action where the restriction is the same. This may result
// in actions being blocked that shouldn't be.
+ $actionObj = null;
if ( Action::exists( $action ) ) {
// Clone the title to prevent mutations to this object which is done
// by Title::loadFromRow() in WikiPage::loadFromRow().
// Creating an action will perform several database queries to ensure that
// the action has not been overridden by the content type.
// @todo FIXME: Pass the relevant context into this function.
- $action = Action::factory( $action, $page, RequestContext::getMain() );
- } else {
- $action = null;
+ $actionObj = Action::factory( $action, $page, RequestContext::getMain() );
+ // Ensure that the retrieved action matches the restriction.
+ if ( $actionObj && $actionObj->getRestriction() !== $action ) {
+ $actionObj = null;
+ }
}
// If no action object is returned, assume that the action requires unblock
// which is the default.
- if ( !$action || $action->requiresUnblock() ) {
+ if ( !$actionObj || $actionObj->requiresUnblock() ) {
if ( $user->isBlockedFrom( $this, $useReplica ) ) {
// @todo FIXME: Pass the relevant context into this function.
$errors[] = $block
$infoMap = [];
// Make sure at least the current wiki is set, for simple configurations.
// This also makes it the first in the map, which is useful for common cases.
- $wikiId = self::getWikiIdFromDomain( self::getCurrentWikiDomain() );
+ $wikiId = self::getWikiIdFromDbDomain( self::getCurrentWikiDbDomain() );
$infoMap[$wikiId] = [
'url' => $wgCanonicalServer,
'parts' => wfParseUrl( $wgCanonicalServer )
*
* @param string|DatabaseDomain $domain
* @return string
+ * @since 1.31
*/
- public static function getWikiIdFromDomain( $domain ) {
+ public static function getWikiIdFromDbDomain( $domain ) {
$domain = DatabaseDomain::newFromId( $domain );
if ( !in_array( $domain->getSchema(), [ null, 'mediawiki' ], true ) ) {
: (string)$domain->getDatabase();
}
+ /**
+ * @param string $domain
+ * @return string
+ * @deprecated Since 1.33; use getWikiIdFromDbDomain()
+ */
+ public static function getWikiIdFromDomain( $domain ) {
+ return self::getWikiIdFromDbDomain( $domain );
+ }
+
/**
* @return DatabaseDomain Database domain of the current wiki
* @since 1.33
*/
- public static function getCurrentWikiDomain() {
+ public static function getCurrentWikiDbDomain() {
global $wgDBname, $wgDBmwschema, $wgDBprefix;
// Avoid invoking LBFactory to avoid any chance of recursion
return new DatabaseDomain( $wgDBname, $wgDBmwschema, (string)$wgDBprefix );
* @return bool Whether $domain has the same DB/prefix as the current wiki
* @since 1.33
*/
- public static function isCurrentWikiDomain( $domain ) {
+ public static function isCurrentWikiDbDomain( $domain ) {
$domain = DatabaseDomain::newFromId( $domain );
- $curDomain = self::getCurrentWikiDomain();
+ $curDomain = self::getCurrentWikiDbDomain();
if ( !in_array( $curDomain->getSchema(), [ null, 'mediawiki' ], true ) ) {
// Include the schema if it is set and is not the default placeholder.
* @since 1.33
*/
public static function isCurrentWikiId( $wikiId ) {
- return ( self::getWikiIdFromDomain( self::getCurrentWikiDomain() ) === $wikiId );
+ return ( self::getWikiIdFromDbDomain( self::getCurrentWikiDbDomain() ) === $wikiId );
}
}
protected function getFormFields() {
$request = $this->getRequest();
- $config = $this->context->getConfig();
- $oldCommentSchema = $config->get( 'CommentTableSchemaMigrationStage' ) === MIGRATION_OLD;
$ret = [
'diff' => [
'type' => 'info',
'name' => 'wpSummary',
'cssclass' => 'mw-summary',
'label-message' => 'summary',
- 'maxlength' => $oldCommentSchema ? 200 : CommentStore::COMMENT_CHARACTER_LIMIT,
+ 'maxlength' => CommentStore::COMMENT_CHARACTER_LIMIT,
'value' => $request->getVal( 'wpSummary', '' ),
'size' => 60,
'spellcheck' => 'true',
}
$value = $this->getMain()->getCheck( $encParamName );
+ $provided = $value;
} elseif ( $type == 'upload' ) {
if ( isset( $default ) ) {
// Having a default value is not allowed
self::dieDebug( __METHOD__, "Multi-values not supported for $encParamName" );
}
$value = $this->getMain()->getUpload( $encParamName );
+ $provided = $value->exists();
if ( !$value->exists() ) {
// This will get the value without trying to normalize it
// (because trying to normalize a large binary file
}
} else {
$value = $this->getMain()->getVal( $encParamName, $default );
+ $provided = $this->getMain()->getCheck( $encParamName );
if ( isset( $value ) && $type == 'namespace' ) {
$type = MWNamespace::getValidNamespaces();
}
// Set a warning if a deprecated parameter has been passed
- if ( $deprecated && $value !== false ) {
+ if ( $deprecated && $provided ) {
$feature = $encParamName;
$m = $this;
while ( !$m->isMain() ) {
}
// Set a warning if a deprecated parameter value has been passed
- $usedDeprecatedValues = $deprecatedValues && $value !== false
+ $usedDeprecatedValues = $deprecatedValues && $provided
? array_intersect( array_keys( $deprecatedValues ), (array)$value )
: [];
if ( $usedDeprecatedValues ) {
return $this->tokenFunctions;
}
- static protected $cachedTokens = [];
+ protected static $cachedTokens = [];
/**
* @deprecated since 1.24
*
* @param stdClass $row The row from which to extract the data.
* @return array An array mapping strings (descriptors) to their respective string values.
- * @access public
*/
public function extractRowInfo( $row ) {
/* Determine the title of the page that has been changed. */
}
$list->reloadFromMaster();
- // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
for ( $item = $list->reset(); $list->current(); $item = $list->next() ) {
$data['items'][$item->getId()] += $item->getApiData( $this->getResult() );
}
"apihelp-userrights-param-remove": "Supprimer l’utilisateur de ces groupes.",
"apihelp-userrights-param-reason": "Motif de la modification.",
"apihelp-userrights-param-tags": "Modifier les balises à appliquer à l’entrée dans le journal des droits utilisateur.",
- "apihelp-userrights-example-user": "Ajouter l’utilisateur <kbd>FooBot</kbd> au groupe <kbd>bot</kbd><!-- {{int:group-bot}} ? -->, et le supprimer des groupes <kbd>sysop</kbd> et <kbd>bureaucrat</kbd>.",
- "apihelp-userrights-example-userid": "Ajouter l’utilisateur d’ID <kbd>123</kbd> au groupe <kbd>robot</kbd>, et le supprimer des groupes <kbd>sysop</kbd> et <kbd>bureaucrate</kbd>.",
+ "apihelp-userrights-example-user": "Ajouter l’utilisateur <kbd>FooBot</kbd> au groupe <kbd>bot</kbd> et le supprimer des groupes <kbd>sysop</kbd> et <kbd>bureaucrat</kbd>.",
+ "apihelp-userrights-example-userid": "Ajouter l’utilisateur d’ID <kbd>123</kbd> au groupe <kbd>bot</kbd>, et le supprimer des groupes <kbd>sysop</kbd> et <kbd>bureaucrat</kbd>.",
"apihelp-userrights-example-expiry": "Ajouter l'utilisateur <kbd>SometimeSysop</kbd> au groupe <kbd>sysop</kbd> pour 1 mois.",
"apihelp-validatepassword-summary": "Valider un mot de passe conformément aux règles concernant les mots de passe du wiki.",
"apihelp-validatepassword-extended-description": "La validation est <samp>Good</samp> si le mot de passe est acceptable, <samp>Change</samp> s'il peut être utilisé pour se connecter et doit être changé, ou <samp>Invalid</samp> s'il n'est pas utilisable.",
"apihelp-watch-example-unwatch": "Ne plus suivre la page <kbd>Page principale</kbd>.",
"apihelp-watch-example-generator": "Suivre les premières pages de l’espace de noms principal.",
"apihelp-format-example-generic": "Renvoyer le résultat de la requête dans le format $1.",
- "apihelp-format-param-wrappedhtml": "Renvoyer le HTML avec une jolie mise en forme et les modules ResourceLoader associés comme un objet JSON.",
- "apihelp-json-summary": "Extraire les données au format JSON.",
+ "apihelp-format-param-wrappedhtml": "Renvoyer le HTML avec une jolie mise en forme pour l'impression et les modules ResourceLoader associés comme un objet JSON.",
+ "apihelp-json-summary": "Sortir les données au format JSON.",
"apihelp-json-param-callback": "Si spécifié, inclut la sortie dans l’appel d’une fonction fournie. Pour plus de sûreté, toutes les données spécifiques à l’utilisateur seront restreintes.",
- "apihelp-json-param-utf8": "Si spécifié, encode la plupart (mais pas tous) des caractères non ASCII en URF-8 au lieu de les remplacer par leur séquence d’échappement hexadécimale. Valeur par défaut quand <var>formatversion</var> ne vaut pas <kbd>1</kbd>.",
- "apihelp-json-param-ascii": "Si spécifié, encode toutes ses séquences d’échappement non ASCII utilisant l’hexadécimal. Valeur par défaut quand <var>formatversion</var> vaut <kbd>1</kbd>.",
+ "apihelp-json-param-utf8": "Si spécifié, encode la plupart des caractères non ASCII (mais pas tous) en UTF-8 au lieu de les remplacer par leur séquence d’échappement hexadécimale. Valeur par défaut quand <var>formatversion</var> ne vaut pas <kbd>1</kbd>.",
+ "apihelp-json-param-ascii": "Si spécifié, encode tous les caractères non ASCII en utilisant des séquences d’échappement hexadécimales. Valeur par défaut quand <var>formatversion</var> vaut <kbd>1</kbd>.",
"apihelp-json-param-formatversion": "Mise en forme de sortie :\n;1:Format rétro-compatible (booléens de style XML, clés <samp>*</samp> pour les nœuds de contenu, etc.).\n;2:Format moderne.\n;latest:Utilise le dernier format (actuellement <kbd>2</kbd>), peut changer sans avertissement.",
- "apihelp-jsonfm-summary": "Extraire les données au format JSON (affiché proprement en HTML).",
+ "apihelp-jsonfm-summary": "Extraire les données au format JSON (HTML mis en forme améliorée pour l'impression).",
"apihelp-none-summary": "Ne rien extraire.",
"apihelp-php-summary": "Extraire les données au format sérialisé de PHP.",
"apihelp-php-param-formatversion": "Mise en forme de la sortie :\n;1:format rétro-compatible (booléens de style XML, clés <samp>*</samp> pour les nœuds de contenu, etc.).\n;2:format moderne.\n;latest:utilise le dernier format (actuellement <kbd>2</kbd>), peut changer sans avertissement.",
- "apihelp-phpfm-summary": "Extraire les données au format sérialisé de PHP (affiché proprement en HTML).",
- "apihelp-rawfm-summary": "Extraire les données, y compris les éléments de débogage, au format JSON (affiché proprement en HTML).",
+ "apihelp-phpfm-summary": "Extraire les données au format sérialisé de PHP (mise en forme HTML améliorée pour l'impression).",
+ "apihelp-rawfm-summary": "Extraire les données, y compris les éléments de débogage, au format JSON (mise en forme HTML améliorée pour l'impression).",
"apihelp-xml-summary": "Extraire les données au format XML.",
"apihelp-xml-param-xslt": "Si spécifié, ajoute la page nommée comme une feuille de style XSL. La valeur doit être un titre dans l’espace de noms {{ns:MediaWiki}} se terminant par <code>.xsl</code>.",
"apihelp-xml-param-includexmlnamespace": "Si spécifié, ajoute un espace de noms XML.",
"api-pageset-param-generator": "Obtenir la liste des pages sur lesquelles travailler en exécutant le module de requête spécifié.\n\n<strong>NOTE :<strong> les noms de paramètre du générateur doivent être préfixés avec un « g », voir les exemples.",
"api-pageset-param-redirects-generator": "Résoudre automatiquement les redirections dans <var>$1titles</var>, <var>$1pageids</var> et <var>$1revids</var>, et dans les pages renvoyées par <var>$1generator</var>.",
"api-pageset-param-redirects-nogenerator": "Résoudre automatiquement les redirections dans <var>$1titles</var>, <var>$1pageids</var> et <var>$1revids</var>.",
- "api-pageset-param-converttitles": "Convertir les titres dans d’autres variantes si nécessaire. Fonctionne uniquement si la langue de contenu du wiki prend en charge la conversion en variantes. Les langues qui prennent en charge la conversion en variante incluent $1.",
- "api-help-title": "Aide de l’API de MediaWiki",
+ "api-pageset-param-converttitles": "Convertir les titres dans d’autres variantes si nécessaire. Fonctionne uniquement si la langue de contenu du wiki prend en charge la conversion en variantes. Les langues qui prennent en charge la conversion en variantes incluent $1.",
+ "api-help-title": "API aide de MediaWiki",
"api-help-lead": "Ceci est une page d’aide de l’API de MediaWiki générée automatiquement.\n\nDocumentation et exemples : https://www.mediawiki.org/wiki/API",
"api-help-main-header": "Module principal",
"api-help-undocumented-module": "Aucune documentation pour le module $1.",
"apierror-compare-relative-to-nothing": "Pas de révision 'depuis' pour <var>torelative</var> à laquelle se rapporter.",
"apierror-contentserializationexception": "Échec de sérialisation du contenu : $1",
"apierror-contenttoobig": "Le contenu que vous avez fourni dépasse la limite de taille d’un article, qui est de $1 {{PLURAL:$1|kilooctet|kilooctets}}.",
- "apierror-copyuploadbaddomain": "Les téléversements par URL ne sont pas autorisés pour ce domaine.",
+ "apierror-copyuploadbaddomain": "Les téléversements par URL ne sont pas autorisés depuis ce domaine.",
"apierror-copyuploadbadurl": "Les téléversements ne sont pas autorisés depuis cette URL.",
"apierror-create-titleexists": "Les titres existants ne peuvent pas être protégés avec <kbd>create</kbd>.",
"apierror-csp-report": "Erreur lors du traitement du rapport CSP: $1.",
"apierror-exceptioncaught": "[$1] Exception interceptée: $2",
"apierror-exceptioncaughttype": "[$1] Exception interceptée de type $2",
"apierror-filedoesnotexist": "Le fichier n’existe pas.",
- "apierror-fileexists-sharedrepo-perm": "Le fichier cible existe dans un dépôt partagé. Utilisr le paramètre <var>ignorewarnings</var> pour l’écraser.",
+ "apierror-fileexists-sharedrepo-perm": "Le fichier cible existe dans un dépôt partagé. Utilisr le paramètre <var>ignorewarnings</var> pour le réécraser.",
"apierror-filenopath": "Il n'est pas possible de récupérer le chemin du fichier local.",
"apierror-filetypecannotberotated": "Le type du fichier ne peut pas être tourné.",
"apierror-formatphp": "Cette réponse ne peut pas être représentée en utilisant <kbd>format=php</kbd>. Voir https://phabricator.wikimedia.org/T68776.",
"apierror-invalidoldimage": "Le paramètre <var>oldimage</var> a un format non valide.",
"apierror-invalidparammix-cannotusewith": "Le paramètre <kbd>$1</kbd> ne peut pas être utilisé avec <kbd>$2</kbd>.",
"apierror-invalidparammix-mustusewith": "Le paramètre <kbd>$1</kbd> ne peut être utilisé qu’avec <kbd>$2</kbd>.",
- "apierror-invalidparammix-parse-new-section": "<kbd>section=new</kbd> ne peut pas être combiné avec le paramètre <var>oldid</var>, <var>pageid</var> ou <var>page</var>. Veuillez utiliser <var>title</var> et <var>text</var>.",
+ "apierror-invalidparammix-parse-new-section": "<kbd>section=new</kbd> ne peut pas être combiné avec les paramètres <var>oldid</var>, <var>pageid</var> ou <var>page</var>. Veuillez utiliser <var>title</var> et <var>text</var>.",
"apierror-invalidparammix": "{{PLURAL:$2|Les paramètres}} $1 ne peuvent pas être utilisés ensemble.",
"apierror-invalidsection": "Le paramètre <var>section</var> doit être un ID de section valide ou <kbd>new</kbd>.",
"apierror-invalidsha1base36hash": "Le hachage SHA1Base36 fourni n’est pas valide.",
"apierror-maxbytes": "Le paramètre <var>$1</var> ne peut excéder $2 octets{{PLURAL:$2||s}}",
"apierror-maxchars": "Le paramètre <var>$1</var> ne peut excéder $2 catactères{{PLURAL:$2||s}}",
"apierror-maxlag-generic": "Attente d’un serveur de base de données : $1 {{PLURAL:$1|seconde|secondes}} de délai.",
- "apierror-maxlag": "Attente de $2 : $1 {{PLURAL:$1|seconed|secondes}} de délai.",
+ "apierror-maxlag": "Attente de $2 : $1 {{PLURAL:$1|seconde|secondes}} de délai.",
"apierror-mimesearchdisabled": "La recherche MIME est désactivée en mode Misère.",
"apierror-missingcontent-pageid": "Contenu manquant pour la page d’ID $1.",
"apierror-missingcontent-revid": "Contenu de la révision d’ID $1 manquant.",
"apierror-missingrev-pageid": "Aucune révision actuelle de la page d’ID $1.",
"apierror-missingrev-title": "Aucune révision actuelle de titre $1.",
"apierror-missingtitle-createonly": "Les titres manquants ne peuvent être protégés qu’avec <kbd>create</kbd>.",
- "apierror-missingtitle": "La page que vous avez spécifié n’existe pas.",
+ "apierror-missingtitle": "La page que vous avez spécifiée n’existe pas.",
"apierror-missingtitle-byname": "La page $1 n’existe pas.",
"apierror-moduledisabled": "Le module <kbd>$1</kbd> a été désactivé.",
"apierror-multival-only-one-of": "{{PLURAL:$3|Seul|Seul un des}} $2 est autorisé pour le paramètre <var>$1</var>.",
"apierror-no-direct-editing": "La modification directe via l’API n’est pas prise en charge pour le modèle de contenu $1 utilisé par $2.",
"apierror-noedit-anon": "Les utilisateurs anonymes ne peuvent pas modifier les pages.",
"apierror-noedit": "Vous n’avez pas le droit de modifier les pages.",
- "apierror-noimageredirect-anon": "Les utilisateurs anonymes ne peut pas créer des redirections d’image.",
- "apierror-noimageredirect": "Vous n’avez pas le droit de créer des redirections d’image.",
- "apierror-nosuchlogid": "Il n’y a pas d’entrée du journal avec l’ID $1.",
+ "apierror-noimageredirect-anon": "Les utilisateurs anonymes ne peuvent pas créer des redirections d’images.",
+ "apierror-noimageredirect": "Vous n’avez pas le droit de créer des redirections d’images.",
+ "apierror-nosuchlogid": "Il n’y a pas d’entrée de journal avec l’ID $1.",
"apierror-nosuchpageid": "Il n’y a pas de page avec l’ID $1.",
"apierror-nosuchrcid": "Il n’y a pas de modification récente avec l’ID $1.",
"apierror-nosuchrevid": "Il n’y a pas de révision d’ID $1.",
"apierror-nosuchsection": "Il n’y a pas de section $1.",
"apierror-nosuchsection-what": "Il ’y a pas de section $1 dans $2.",
"apierror-nosuchuserid": "Il n'y a pas d'utilisateur ayant l'ID $1.",
- "apierror-notarget": "Vous n’avez pas spécifié une cible valide pour cette action.",
+ "apierror-notarget": "Vous n’avez pas spécifié de cible valide pour cette action.",
"apierror-notpatrollable": "La révision r$1 ne peut pas être patrouillée car elle est trop ancienne.",
"apierror-nouploadmodule": "Aucun module de téléversement défini.",
"apierror-offline": "Impossible de continuer du fait de problèmes de connexion au réseau. Assurez-vous d’avoir une connexion internet opérationnelle et réessayez.",
"apierror-paramempty": "Le paramètre <var>$1</var> ne peut pas être vide.",
"apierror-parsetree-notwikitext": "<kbd>prop=parsetree</kbd> n’est pris en charge que pour le contenu wikitexte.",
"apierror-parsetree-notwikitext-title": "<kbd>prop=parsetree</kbd> n’est pris en charge que pour le contenu wikitexte. $1 utilise le modèle de contenu $2.",
- "apierror-pastexpiry": "Le temps d’expiration « $1 » est dans le passé.",
+ "apierror-pastexpiry": "La date d’expiration « $1 » est dépassée.",
"apierror-permissiondenied": "Vous n’avez pas le droit de $1.",
"apierror-permissiondenied-generic": "Autorisation refusée.",
"apierror-permissiondenied-patrolflag": "Vous avez besoin du droit <code>patrol</code> ou <code>patrolmarks</code> pour demander le drapeau patrouillé.",
"apierror-ratelimited": "Vous avez dépassé votre limite de débit. Veuillez attendre un peu et réessayer.",
"apierror-readapidenied": "Vous avez besoin du droit de lecture pour utiliser ce module.",
"apierror-readonly": "Ce wiki est actuellement en mode lecture seule.",
- "apierror-reauthenticate": "Vous n’avez pas authentifié récemment cette session ; veuillez vous authentifier de nouveau.",
+ "apierror-reauthenticate": "Vous ne vous êtes pas authentifié récemment pour cette session ; veuillez vous authentifier à nouveau.",
"apierror-redirect-appendonly": "Vous avez essayé de modifier en utilisant le mode de suivi de redirection, qui doit être utilisé en lien avec <kbd>section=new</kbd>, <var>prependtext</var>, ou <var>appendtext</var>.",
- "apierror-revdel-mutuallyexclusive": "Le même champ ne peut pas être utilisé à la fois en <var>hide</var> et <var>show</var>.",
+ "apierror-revdel-mutuallyexclusive": "Le même champ ne peut pas être utilisé à la fois pour <var>hide</var> et <var>show</var>.",
"apierror-revdel-needtarget": "Un titre cible est nécessaire pour ce type RevDel.",
- "apierror-revdel-paramneeded": "Au moins une valeur est nécessaire pour <var>hide</var> ou <var>show</var>.",
+ "apierror-revdel-paramneeded": "Au moins une valeur est nécessaire pour <var>hide</var> et/ou <var>show</var>.",
"apierror-revisions-badid": "Pas de correction trouvée pour le paramètre <var>$1</var>.",
"apierror-revisions-norevids": "Le paramètre <var>revids</var> ne peut pas être utilisé avec les options de liste (<var>$1limit</var>, <var>$1startid</var>, <var>$1endid</var>, <kbd>$1dir=newer</kbd>, <var>$1user</var>, <var>$1excludeuser</var>, <var>$1start</var>, et <var>$1end</var>).",
"apierror-revisions-singlepage": "<var>titles</var>, <var>pageids</var> ou un générateur a été utilisé pour fournir plusieurs pages, mais les paramètres <var>$1limit</var>, <var>$1startid</var>, <var>$1endid</var>, <kbd>$1dir=newer</kbd>, <var>$1user</var>, <var>$1excludeuser</var>, <var>$1start</var> et <var>$1end</var> ne peuvent être utilisés que sur une seule page.",
/**
* All item keys
*/
- static public $allKeys = [
+ public static $allKeys = [
'fallback', 'namespaceNames', 'bookstoreList',
'magicWords', 'messages', 'rtl', 'capitalizeAllNouns', 'digitTransformTable',
'separatorTransformTable', 'minimumGroupingDigits',
* Keys for items which consist of associative arrays, which may be merged
* by a fallback sequence.
*/
- static public $mergeableMapKeys = [ 'messages', 'namespaceNames',
+ public static $mergeableMapKeys = [ 'messages', 'namespaceNames',
'namespaceAliases', 'dateFormats', 'imageFiles', 'preloadedMessages'
];
/**
* Keys for items which are a numbered array.
*/
- static public $mergeableListKeys = [ 'extraUserToggles' ];
+ public static $mergeableListKeys = [ 'extraUserToggles' ];
/**
* Keys for items which contain an array of arrays of equivalent aliases
* for each subitem. The aliases may be merged by a fallback sequence.
*/
- static public $mergeableAliasListKeys = [ 'specialPageAliases' ];
+ public static $mergeableAliasListKeys = [ 'specialPageAliases' ];
/**
* Keys for items which contain an associative array, and may be merged if
* the primary value contains the special array key "inherit". That array
* key is removed after the first merge.
*/
- static public $optionalMergeKeys = [ 'bookstoreList' ];
+ public static $optionalMergeKeys = [ 'bookstoreList' ];
/**
* Keys for items that are formatted like $magicWords
*/
- static public $magicWordKeys = [ 'magicWords' ];
+ public static $magicWordKeys = [ 'magicWords' ];
/**
* Keys for items where the subitems are stored in the backend separately.
*/
- static public $splitKeys = [ 'messages' ];
+ public static $splitKeys = [ 'messages' ];
/**
* Keys which are loaded automatically by initLanguage()
*/
- static public $preloadedKeys = [ 'dateFormats', 'namespaceNames' ];
+ public static $preloadedKeys = [ 'dateFormats', 'namespaceNames' ];
/**
* Associative array of cached plural rules. The key is the language code,
* @inheritDoc
*/
public function displaysOnUnstructuredUi() {
- return !!$this->showHide;
+ return (bool)$this->showHide;
}
/**
* @return bool
*/
public function anySelected( FormOptions $opts ) {
- return !!count( array_filter(
+ return (bool)count( array_filter(
$this->getFilters(),
function ( ChangesListFilter $filter ) use ( $opts ) {
return $filter->isSelected( $opts );
* @return Status
*/
public function updateChangeTagsOnAll( $tagsToAdd, $tagsToRemove, $params, $reason, $user ) {
- // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
for ( $this->reset(); $this->current(); $this->next() ) {
$item = $this->current();
$status = ChangeTags::updateTagsWithChecks( $tagsToAdd, $tagsToRemove,
* @return Status
*/
public function updateChangeTagsOnAll( $tagsToAdd, $tagsToRemove, $params, $reason, $user ) {
- // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
for ( $this->reset(); $this->current(); $this->next() ) {
$item = $this->current();
$status = ChangeTags::updateTagsWithChecks( $tagsToAdd, $tagsToRemove,
$date = $d->format( 'D M j G:i:s T Y' );
$host = wfHostname();
- $wiki = WikiMap::getWikiIdFromDomain( WikiMap::getCurrentWikiDomain() );
+ $wiki = WikiMap::getWikiIdFromDbDomain( WikiMap::getCurrentWikiDbDomain() );
$text = "{$date}\t{$host}\t{$wiki}\t{$message}\n";
return $text;
*/
protected static function formatAsWfDebugLog( $channel, $message, $context ) {
$time = wfTimestamp( TS_DB );
- $wiki = WikiMap::getWikiIdFromDomain( WikiMap::getCurrentWikiDomain() );
+ $wiki = WikiMap::getWikiIdFromDbDomain( WikiMap::getCurrentWikiDbDomain() );
$host = wfHostname();
$text = "{$time} {$host} {$wiki}: {$message}\n";
return $text;
public function __invoke( array $record ) {
global $wgVersion;
$record['extra']['host'] = wfHostname();
- $record['extra']['wiki'] = WikiMap::getWikiIdFromDomain( WikiMap::getCurrentWikiDomain() );
+ $record['extra']['wiki'] = WikiMap::getWikiIdFromDbDomain( WikiMap::getCurrentWikiDbDomain() );
$record['extra']['mwversion'] = $wgVersion;
$record['extra']['reqId'] = \WebRequest::getRequestId();
if ( wfIsCLI() && isset( $_SERVER['argv'] ) ) {
public function getAsJobSpecification() {
return [
- 'wiki' => WikiMap::getWikiIdFromDomain( $this->getDB()->getDomainID() ),
+ 'wiki' => WikiMap::getWikiIdFromDbDomain( $this->getDB()->getDomainID() ),
'job' => new JobSpecification(
'deleteLinks',
[ 'pageId' => $this->pageId, 'timestamp' => $this->timestamp ],
*/
private $linkDeletions = null;
+ /**
+ * @var null|array Added external links if calculated.
+ */
+ private $externalLinkInsertions = null;
+
+ /**
+ * @var null|array Deleted external links if calculated.
+ */
+ private $externalLinkDeletions = null;
+
/**
* @var null|array Added properties if calculated.
*/
# External links
$existingEL = $this->getExistingExternals();
+ $this->externalLinkDeletions = $this->getExternalDeletions( $existingEL );
+ $this->externalLinkInsertions = $this->getExternalInsertions(
+ $existingEL );
$this->incrTableUpdate(
'externallinks',
'el',
- $this->getExternalDeletions( $existingEL ),
- $this->getExternalInsertions( $existingEL ) );
+ $this->externalLinkDeletions,
+ $this->externalLinkInsertions );
# Language links
$existingLL = $this->getExistingInterlangs();
return $result;
}
+ /**
+ * Fetch external links added by this LinksUpdate. Only available after
+ * the update is complete.
+ * @since 1.33
+ * @return null|array Array of Strings
+ */
+ public function getAddedExternalLinks() {
+ if ( $this->externalLinkInsertions === null ) {
+ return null;
+ }
+ $result = [];
+ foreach ( $this->externalLinkInsertions as $key => $value ) {
+ $result[] = $value['el_to'];
+ }
+ return $result;
+ }
+
+ /**
+ * Fetch external links removed by this LinksUpdate. Only available after
+ * the update is complete.
+ * @since 1.33
+ * @return null|array Array of Strings
+ */
+ public function getRemovedExternalLinks() {
+ if ( $this->externalLinkDeletions === null ) {
+ return null;
+ }
+ return array_keys( $this->externalLinkDeletions );
+ }
+
/**
* Fetch page properties added by this LinksUpdate.
* Only available after the update is complete.
}
return [
- 'wiki' => WikiMap::getWikiIdFromDomain( $this->getDB()->getDomainID() ),
+ 'wiki' => WikiMap::getWikiIdFromDbDomain( $this->getDB()->getDomainID() ),
'job' => new JobSpecification(
'refreshLinksPrioritized',
[
RevisionRecord::FOR_THIS_USER, $this->getUser() );
$this->mRevisionsIdsLoaded = $this->mRevisionsLoaded = true;
- $this->mTextLoaded = !!$oldRevision + 1;
+ $this->mTextLoaded = $oldRevision ? 2 : 1;
$this->isContentOverridden = false;
$this->slotDiffRenderers = null;
}
}
/**
- * @access private
+ * @private
*/
function nextPage() {
if ( $this->skipTo( 'page', 'mediawiki' ) ) {
}
/**
- * @access private
+ * @private
*/
function nextRev() {
if ( $this->skipTo( 'revision' ) ) {
}
/**
- * @access private
+ * @private
* @return string
*/
function nextText() {
}
/**
- * @access private
+ * @private
* @param string $name
* @param string $parent
* @return bool|null
* no sub-elements or such scary things.
*
* @return string
- * @access private
+ * @private
*/
function nodeContents() {
if ( $this->atEnd ) {
}
/**
- * @access private
+ * @private
* @return null
*/
function close() {
/**
* Closes a "<page>" section on the output stream.
*
- * @access private
+ * @private
* @return string
*/
function closePage() {
*
* @param object $row
* @return string
- * @access private
+ * @private
*/
function writeRevision( $row ) {
$out = " <revision>\n";
*
* @param object $row
* @return string
- * @access private
+ * @private
*/
function writeLogItem( $row ) {
$out = " <logitem>\n";
*/
public static function singleton( $domain = false ) {
if ( $domain === false ) {
- $domain = WikiMap::getCurrentWikiDomain()->getId();
+ $domain = WikiMap::getCurrentWikiDbDomain()->getId();
}
if ( !isset( self::$instances[$domain] ) ) {
$oldver, $comment, $pageText, $props = false, $timestamp = false, $user = null, $tags = [],
$createNullRevision = true
) {
- global $wgCommentTableSchemaMigrationStage, $wgActorTableSchemaMigrationStage;
+ global $wgActorTableSchemaMigrationStage;
if ( is_null( $user ) ) {
global $wgUser;
'oi_width' => 'img_width',
'oi_height' => 'img_height',
'oi_bits' => 'img_bits',
+ 'oi_description_id' => 'img_description_id',
'oi_timestamp' => 'img_timestamp',
'oi_metadata' => 'img_metadata',
'oi_media_type' => 'img_media_type',
];
$joins = [];
- if ( $wgCommentTableSchemaMigrationStage <= MIGRATION_WRITE_BOTH ) {
- $fields['oi_description'] = 'img_description';
- }
- if ( $wgCommentTableSchemaMigrationStage >= MIGRATION_WRITE_BOTH ) {
- $fields['oi_description_id'] = 'img_description_id';
- }
-
- if ( $wgCommentTableSchemaMigrationStage !== MIGRATION_OLD &&
- $wgCommentTableSchemaMigrationStage !== MIGRATION_NEW
- ) {
- // Upgrade any rows that are still old-style. Otherwise an upgrade
- // might be missed if a deletion happens while the migration script
- // is running.
- $res = $dbw->select(
- [ 'image' ],
- [ 'img_name', 'img_description' ],
- [
- 'img_name' => $this->getName(),
- 'img_description_id' => 0,
- ],
- __METHOD__
- );
- foreach ( $res as $row ) {
- $imgFields = $commentStore->insert( $dbw, 'img_description', $row->img_description );
- $dbw->update(
- 'image',
- $imgFields,
- [ 'img_name' => $row->img_name ],
- __METHOD__
- );
- }
- }
-
if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_OLD ) {
$fields['oi_user'] = 'img_user';
$fields['oi_user_text'] = 'img_user_text';
}
protected function doDBInserts() {
- global $wgCommentTableSchemaMigrationStage, $wgActorTableSchemaMigrationStage;
+ global $wgActorTableSchemaMigrationStage;
$now = time();
$dbw = $this->file->repo->getMasterDB();
'fa_media_type' => 'img_media_type',
'fa_major_mime' => 'img_major_mime',
'fa_minor_mime' => 'img_minor_mime',
+ 'fa_description_id' => 'img_description_id',
'fa_timestamp' => 'img_timestamp',
'fa_sha1' => 'img_sha1'
];
$commentStore->insert( $dbw, 'fa_deleted_reason', $this->reason )
);
- if ( $wgCommentTableSchemaMigrationStage <= MIGRATION_WRITE_BOTH ) {
- $fields['fa_description'] = 'img_description';
- }
- if ( $wgCommentTableSchemaMigrationStage >= MIGRATION_WRITE_BOTH ) {
- $fields['fa_description_id'] = 'img_description_id';
- }
-
- if ( $wgCommentTableSchemaMigrationStage !== MIGRATION_OLD &&
- $wgCommentTableSchemaMigrationStage !== MIGRATION_NEW
- ) {
- // Upgrade any rows that are still old-style. Otherwise an upgrade
- // might be missed if a deletion happens while the migration script
- // is running.
- $res = $dbw->select(
- [ 'image' ],
- [ 'img_name', 'img_description' ],
- [
- 'img_name' => $this->file->getName(),
- 'img_description_id' => 0,
- ],
- __METHOD__
- );
- foreach ( $res as $row ) {
- $imgFields = $commentStore->insert( $dbw, 'img_description', $row->img_description );
- $dbw->update(
- 'image',
- $imgFields,
- [ 'img_name' => $row->img_name ],
- __METHOD__
- );
- }
- }
-
if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_OLD ) {
$fields['fa_user'] = 'img_user';
$fields['fa_user_text'] = 'img_user_text';
protected $mAttribs = [];
/** @var bool */
- static private $modeMapping = false;
+ private static $modeMapping = false;
/**
* Get a new image gallery. This is the method other callers
* Not used by OOUI form fields.
*/
class HTMLCheckMatrix extends HTMLFormField implements HTMLNestedFilterable {
- static private $requiredParams = [
+ private static $requiredParams = [
// Required by underlying HTMLFormField
'fieldname',
// Required by HTMLCheckMatrix
* @ingroup HTTP
*/
class Http {
- static public $httpEngine = false;
+ public static $httpEngine = false;
/**
* Perform an HTTP request
*/
public function create( $url, array $options = [], $caller = __METHOD__ ) {
if ( !Http::$httpEngine ) {
- Http::$httpEngine = function_exists( 'curl_init' ) ? 'curl' : 'php';
+ Http::$httpEngine = 'guzzle';
} elseif ( Http::$httpEngine == 'curl' && !function_exists( 'curl_init' ) ) {
throw new DomainException( __METHOD__ . ': curl (https://secure.php.net/curl) is not ' .
'installed, but Http::$httpEngine is set to "curl"' );
* Fetches text contents of the current element, assuming
* no sub-elements or such scary things.
* @return string
- * @access private
+ * @private
*/
public function nodeContents() {
if ( $this->reader->isEmptyElement ) {
* @since 1.30
*/
protected function migrateComments() {
- global $wgCommentTableSchemaMigrationStage;
- if ( $wgCommentTableSchemaMigrationStage >= MIGRATION_WRITE_NEW &&
- !$this->updateRowExists( 'MigrateComments' )
- ) {
+ if ( !$this->updateRowExists( 'MigrateComments' ) ) {
$this->output(
"Migrating comments to the 'comments' table, printing progress markers. For large\n" .
"databases, you may want to hit Ctrl-C and do this manually with\n" .
* @since 1.32
*/
protected function migrateImageCommentTemp() {
- global $wgCommentTableSchemaMigrationStage;
-
if ( $this->tableExists( 'image_comment_temp' ) ) {
- if ( $wgCommentTableSchemaMigrationStage > MIGRATION_OLD ) {
- $this->output( "Merging image_comment_temp into the image table\n" );
- $task = $this->maintenance->runChild(
- MigrateImageCommentTemp::class, 'migrateImageCommentTemp.php'
- );
- $task->setForce();
- $ok = $task->execute();
- $this->output( $ok ? "done.\n" : "errors were encountered.\n" );
- } else {
- $ok = true;
- }
+ $this->output( "Merging image_comment_temp into the image table\n" );
+ $task = $this->maintenance->runChild(
+ MigrateImageCommentTemp::class, 'migrateImageCommentTemp.php'
+ );
+ $task->setForce();
+ $ok = $task->execute();
+ $this->output( $ok ? "done.\n" : "errors were encountered.\n" );
if ( $ok ) {
$this->dropTable( 'image_comment_temp' );
}
[ 'dropField', 'change_tag', 'ct_tag', 'patch-drop-ct_tag.sql' ],
[ 'dropTable', 'valid_tag' ],
[ 'dropTable', 'tag_summary' ],
+ [ 'dropField', 'protected_titles', 'pt_reason', 'patch-drop-comment-fields.sql' ],
];
}
[ 'dropField', 'change_tag', 'ct_tag', 'patch-drop-ct_tag.sql' ],
[ 'dropTable', 'valid_tag' ],
[ 'dropTable', 'tag_summary' ],
+ [ 'dropField', 'protected_titles', 'pt_reason', 'patch-drop-comment-fields.sql' ],
];
}
[ 'dropField', 'change_tag', 'ct_tag', 'patch-drop-ct_tag.sql' ],
[ 'dropTable', 'valid_tag' ],
[ 'dropTable', 'tag_summary' ],
+ [ 'dropField', 'protected_titles', 'pt_reason', 'patch-drop-comment-fields.sql' ],
// KEEP THIS AT THE BOTTOM!!
[ 'doRebuildDuplicateFunction' ],
[ 'dropField', 'change_tag', 'ct_tag', 'patch-drop-ct_tag.sql' ],
[ 'dropTable', 'valid_tag' ],
[ 'dropTable', 'tag_summary' ],
+ [ 'dropPgField', 'archive', 'ar_comment' ],
+ [ 'dropDefault', 'archive', 'ar_comment_id' ],
+ [ 'dropPgField', 'ipblocks', 'ipb_reason' ],
+ [ 'dropDefault', 'ipblocks', 'ipb_reason_id' ],
+ [ 'dropPgField', 'image', 'img_description' ],
+ [ 'dropDefault', 'image', 'img_description_id' ],
+ [ 'dropPgField', 'oldimage', 'oi_description' ],
+ [ 'dropDefault', 'oldimage', 'oi_description_id' ],
+ [ 'dropPgField', 'filearchive', 'fa_deleted_reason' ],
+ [ 'dropDefault', 'filearchive', 'fa_deleted_reason_id' ],
+ [ 'dropPgField', 'filearchive', 'fa_description' ],
+ [ 'dropDefault', 'filearchive', 'fa_description_id' ],
+ [ 'dropPgField', 'recentchanges', 'rc_comment' ],
+ [ 'dropDefault', 'recentchanges', 'rc_comment_id' ],
+ [ 'dropPgField', 'logging', 'log_comment' ],
+ [ 'dropDefault', 'logging', 'log_comment_id' ],
+ [ 'dropPgField', 'protected_titles', 'pt_reason' ],
+ [ 'dropDefault', 'protected_titles', 'pt_reason_id' ],
];
}
protected function setDefault( $table, $field, $default ) {
$info = $this->db->fieldInfo( $table, $field );
- if ( $info->defaultValue() !== $default ) {
+ if ( $info && $info->defaultValue() !== $default ) {
$this->output( "Changing '$table.$field' default value\n" );
$this->db->query( "ALTER TABLE $table ALTER $field SET DEFAULT "
. $this->db->addQuotes( $default ) );
[ 'dropField', 'change_tag', 'ct_tag', 'patch-drop-ct_tag.sql' ],
[ 'dropTable', 'valid_tag' ],
[ 'dropTable', 'tag_summary' ],
+ [ 'dropField', 'archive', 'ar_comment', 'patch-archive-drop-ar_comment.sql' ],
+ [ 'dropField', 'ipblocks', 'ipb_reason', 'patch-ipblocks-drop-ipb_reason.sql' ],
+ [ 'dropField', 'image', 'img_description', 'patch-image-drop-img_description.sql' ],
+ [ 'dropField', 'oldimage', 'oi_description', 'patch-oldimage-drop-oi_description.sql' ],
+ [ 'dropField', 'filearchive', 'fa_description', 'patch-filearchive-drop-fa_description.sql' ],
+ [ 'dropField', 'recentchanges', 'rc_comment', 'patch-recentchanges-drop-rc_comment.sql' ],
+ [ 'dropField', 'logging', 'log_comment', 'patch-logging-drop-log_comment.sql' ],
+ [ 'dropField', 'protected_titles', 'pt_reason', 'patch-protected_titles-drop-pt_reason.sql' ],
];
}
"config-using-32bit": "<strong>Папярэджаньне:</strong> падобна, што вашая сыстэма выкарыстоўвае 32-бітавыя цэлыя лікі. Гэта [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:32-bit не рэкамэндуецца].",
"config-db-type": "Тып базы зьвестак:",
"config-db-host": "Хост базы зьвестак:",
- "config-db-host-help": "Ð\9aалÑ\96 Ñ\81Ñ\8dÑ\80вÑ\8dÑ\80 Ð\92аÑ\88ай базÑ\8b зÑ\8cвеÑ\81Ñ\82ак знаÑ\85одзÑ\96Ñ\86Ñ\86а на Ñ\96нÑ\88Ñ\8bм Ñ\81Ñ\8dÑ\80вÑ\8dÑ\80Ñ\8b, Ñ\83вÑ\8fдзÑ\96Ñ\86е Ñ\82Ñ\83Ñ\82 Ñ\96мÑ\8f Ñ\85оÑ\81Ñ\82а Ñ\86Ñ\96 IP-адÑ\80аÑ\81.\n\nÐ\9aалÑ\96 Ð\92Ñ\8b каÑ\80Ñ\8bÑ\81Ñ\82аеÑ\86еÑ\81Ñ\8f shared-Ñ\85оÑ\81Ñ\82Ñ\8bнгам, Ð\92аÑ\88 Ñ\85оÑ\81Ñ\82Ñ\8bнг-пÑ\80авайдÑ\8dÑ\80 мÑ\83Ñ\81Ñ\96Ñ\86Ñ\8c даÑ\86Ñ\8c Ð\92ам Ñ\81лÑ\83Ñ\88нае Ñ\96мÑ\8f Ñ\85оÑ\81Ñ\82а базÑ\8b зÑ\8cвеÑ\81Ñ\82ак Ñ\83 Ñ\81ваÑ\91й дакÑ\83мÑ\8dнÑ\82аÑ\86Ñ\8bÑ\96.\n\nÐ\9aалÑ\96 Ð\92Ñ\8b Ñ\83Ñ\81Ñ\82алÑ\91Ñ\9eваеÑ\86е Ñ\81Ñ\8dÑ\80вÑ\8dÑ\80 Windows з вÑ\8bкаÑ\80Ñ\8bÑ\81Ñ\82анÑ\8cнем MySQL, вÑ\8bкаÑ\80Ñ\8bÑ\81Ñ\82анÑ\8cне «localhost» можа не пÑ\80аÑ\86аваÑ\86Ñ\8c длÑ\8f назвÑ\8b Ñ\81Ñ\8dÑ\80вÑ\8dÑ\80а. У гÑ\8dÑ\82Ñ\8bм вÑ\8bпадкÑ\83 паÑ\81пÑ\80абÑ\83йÑ\86е пазнаÑ\87Ñ\8bÑ\86Ñ\8c «127.0.0.1» длÑ\8f лÑ\8fкалÑ\8cнага IP-адÑ\80аÑ\81а.\n\nÐ\9aалÑ\96 Ð\92ы выкарыстоўваеце PostgreSQL, пакіньце поле пустым, каб далучыцца праз Unix-сокет.",
+ "config-db-host-help": "Ð\9aалÑ\96 Ñ\81Ñ\8dÑ\80вÑ\8dÑ\80 ваÑ\88ай базÑ\8b зÑ\8cвеÑ\81Ñ\82ак знаÑ\85одзÑ\96Ñ\86Ñ\86а на Ñ\96нÑ\88Ñ\8bм Ñ\81Ñ\8dÑ\80вÑ\8dÑ\80Ñ\8b, Ñ\83вÑ\8fдзÑ\96Ñ\86е Ñ\82Ñ\83Ñ\82 Ñ\96мÑ\8f Ñ\85оÑ\81Ñ\82а Ñ\86Ñ\96 IP-адÑ\80аÑ\81.\n\nÐ\9aалÑ\96 вÑ\8b каÑ\80Ñ\8bÑ\81Ñ\82аеÑ\86еÑ\81Ñ\8f shared-Ñ\85оÑ\81Ñ\82Ñ\8bнгам, ваÑ\88 Ñ\85оÑ\81Ñ\82Ñ\8bнг-пÑ\80авайдÑ\8dÑ\80 мÑ\83Ñ\81Ñ\96Ñ\86Ñ\8c даÑ\86Ñ\8c вам Ñ\81лÑ\83Ñ\88нае Ñ\96мÑ\8f Ñ\85оÑ\81Ñ\82а базÑ\8b зÑ\8cвеÑ\81Ñ\82ак Ñ\83 Ñ\81ваÑ\91й дакÑ\83мÑ\8dнÑ\82аÑ\86Ñ\8bÑ\96.\n\nÐ\9aалÑ\96 вÑ\8b Ñ\9eжÑ\8bваеÑ\86е MySQL, вÑ\8bкаÑ\80Ñ\8bÑ\81Ñ\82анÑ\8cне «localhost» можа не пÑ\80аÑ\86аваÑ\86Ñ\8c длÑ\8f назвÑ\8b Ñ\81Ñ\8dÑ\80вÑ\8dÑ\80а. У гÑ\8dÑ\82Ñ\8bм вÑ\8bпадкÑ\83 паÑ\81пÑ\80абÑ\83йÑ\86е пазнаÑ\87Ñ\8bÑ\86Ñ\8c «127.0.0.1» длÑ\8f лÑ\8fкалÑ\8cнага IP-адÑ\80аÑ\81Ñ\83.\n\nÐ\9aалÑ\96 вы выкарыстоўваеце PostgreSQL, пакіньце поле пустым, каб далучыцца праз Unix-сокет.",
"config-db-host-oracle": "TNS базы зьвестак:",
"config-db-host-oracle-help": "Увядзіце слушнае [http://download.oracle.com/docs/cd/B28359_01/network.111/b28317/tnsnames.htm лякальнае імя злучэньня]; файл tnsnames.ora павінен быць бачным для гэтага ўсталяваньня.<br />Калі Вы выкарыстоўваеце кліенцкія бібліятэкі 10g ці больш новыя, Вы можаце таксама выкарыстоўваць мэтад наданьня назваў [http://download.oracle.com/docs/cd/E11882_01/network.112/e10836/naming.htm лёгкае злучэньне].",
"config-db-wiki-settings": "Ідэнтыфікацыя гэтай вікі",
private function getInterwikiCacheEntry( $prefix ) {
wfDebug( __METHOD__ . "( $prefix )\n" );
- $wikiId = WikiMap::getWikiIdFromDomain( WikiMap::getCurrentWikiDomain() );
+ $wikiId = WikiMap::getWikiIdFromDbDomain( WikiMap::getCurrentWikiDbDomain() );
$value = false;
try {
private function getAllPrefixesCached( $local ) {
wfDebug( __METHOD__ . "()\n" );
- $wikiId = WikiMap::getWikiIdFromDomain( WikiMap::getCurrentWikiDomain() );
+ $wikiId = WikiMap::getWikiIdFromDbDomain( WikiMap::getCurrentWikiDbDomain() );
$data = [];
try {
global $wgJobClasses;
$this->assertNotReadOnly();
- if ( !WikiMap::isCurrentWikiDomain( $this->domain ) ) {
+ if ( !WikiMap::isCurrentWikiDbDomain( $this->domain ) ) {
throw new MWException(
"Cannot pop '{$this->type}' job off foreign '{$this->domain}' wiki queue." );
} elseif ( !isset( $wgJobClasses[$this->type] ) ) {
// Try to insert the jobs and update $partitionsTry on any failures.
// Retry to insert any remaning jobs again, ignoring the bad partitions.
$jobsLeft = $jobs;
- // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
for ( $i = $this->maxPartitionsTry; $i > 0 && count( $jobsLeft ); --$i ) {
try {
$partitionRing->getLiveLocationWeights();
global $wgLocalDatabases;
if ( $domain === false ) {
- $domain = WikiMap::getCurrentWikiDomain()->getId();
+ $domain = WikiMap::getCurrentWikiDbDomain()->getId();
}
if ( !isset( self::$instances[$domain] ) ) {
self::$instances[$domain] = new self( $domain, wfConfiguredReadOnlyReason() );
// Make sure jobs are not getting pushed to bogus wikis. This can confuse
// the job runner system into spawning endless RPC requests that fail (T171371).
- $wikiId = WikiMap::getWikiIdFromDomain( $domain );
+ $wikiId = WikiMap::getWikiIdFromDbDomain( $domain );
if (
- !WikiMap::isCurrentWikiDomain( $domain ) &&
+ !WikiMap::isCurrentWikiDbDomain( $domain ) &&
!in_array( $wikiId, $wgLocalDatabases )
) {
self::$instances[$domain]->invalidDomain = true;
*/
private function getCachedConfigVar( $name ) {
// @TODO: cleanup this whole method with a proper config system
- if ( WikiMap::isCurrentWikiDomain( $this->domain ) ) {
+ if ( WikiMap::isCurrentWikiDbDomain( $this->domain ) ) {
return $GLOBALS[$name]; // common case
} else {
- $wiki = WikiMap::getWikiIdFromDomain( $this->domain );
+ $wiki = WikiMap::getWikiIdFromDbDomain( $this->domain );
$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
$value = $cache->getWithSetCallback(
$cache->makeGlobalKey( 'jobqueue', 'configvalue', $this->domain, $name ),
$type = is_string( $type ) ? $type : $this->type;
// Use wiki ID for b/c
- $keyspace = WikiMap::getWikiIdFromDomain( $this->domain );
+ $keyspace = WikiMap::getWikiIdFromDbDomain( $this->domain );
$parts = [ $keyspace, 'jobqueue', $type, $prop ];
* @param int $errno
* @param string $errstr
* @return bool
- * @access private
+ * @private
*/
public function handleWarning( $errno, $errstr ) {
$this->logger->error( $errstr ); // more detailed error logging
* specific language governing permissions and limitations under the License.
*/
-// strlen() is actually pretty fast compared to just about any loop body
-// phpcs:disable Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed
-
/**
* Read the directory of a Microsoft Compound File Binary file, a.k.a. an OLE
* file, and detect the MIME type.
* distinguish them from MIME types.
*
* This function relies on the mapping defined by $this->mMediaTypes
- * @access private
+ * @private
* @param string $extMime
* @return int|string
*/
}
public function getFlag( $flag ) {
- return !!( $this->flags & $flag );
+ return (bool)( $this->flags & $flag );
}
/**
* Test if the specified index represents an open connection
*
* @param int $index Server index
- * @access private
+ * @private
* @return bool
*/
private function isOpen( $index ) {
static function makeMsgId() {
global $wgSMTP, $wgServer;
- $domainId = WikiMap::getCurrentWikiDomain()->getId();
+ $domainId = WikiMap::getCurrentWikiDbDomain()->getId();
$msgid = uniqid( $domainId . ".", true /** for cygwin */ );
if ( is_array( $wgSMTP ) && isset( $wgSMTP['IDHost'] ) && $wgSMTP['IDHost'] ) {
$domain = $wgSMTP['IDHost'];
return $keyspace;
}
- return WikiMap::getCurrentWikiDomain()->getId();
+ return WikiMap::getCurrentWikiDbDomain()->getId();
}
/**
// HTML maxlength uses "UTF-16 code units", which means that characters outside BMP
// (e.g. emojis) count for two each. This limit is overridden in JS to instead count
- // Unicode codepoints (or 255 UTF-8 bytes for old schema).
- $conf = $this->getContext()->getConfig();
- $oldCommentSchema = $conf->get( 'CommentTableSchemaMigrationStage' ) === MIGRATION_OLD;
+ // Unicode codepoints.
$fields[] = new OOUI\FieldLayout(
new OOUI\TextInputWidget( [
'name' => 'wpReason',
'inputId' => 'wpReason',
'tabIndex' => 2,
- 'maxLength' => $oldCommentSchema ? 255 : CommentStore::COMMENT_CHARACTER_LIMIT,
+ 'maxLength' => CommentStore::COMMENT_CHARACTER_LIMIT,
'infusable' => true,
'value' => $reason,
'autofocus' => true,
*/
protected function archiveRevisions( $dbw, $id, $suppress ) {
global $wgContentHandlerUseDB, $wgMultiContentRevisionSchemaMigrationStage,
- $wgCommentTableSchemaMigrationStage, $wgActorTableSchemaMigrationStage,
- $wgDeleteRevisionsBatchSize;
+ $wgActorTableSchemaMigrationStage, $wgDeleteRevisionsBatchSize;
// Given the lock above, we can be confident in the title and page ID values
$namespace = $this->getTitle()->getNamespace();
$dbw->insert( 'archive', $rowsInsert, __METHOD__ );
$dbw->delete( 'revision', [ 'rev_id' => $revids ], __METHOD__ );
- if ( $wgCommentTableSchemaMigrationStage > MIGRATION_OLD ) {
- $dbw->delete( 'revision_comment_temp', [ 'revcomment_rev' => $revids ], __METHOD__ );
- }
+ $dbw->delete( 'revision_comment_temp', [ 'revcomment_rev' => $revids ], __METHOD__ );
if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_NEW ) {
$dbw->delete( 'revision_actor_temp', [ 'revactor_rev' => $revids ], __METHOD__ );
}
// Clear caches
self::onArticleDelete( $this->mTitle );
ResourceLoaderWikiModule::invalidateModuleCache(
- $this->mTitle, $revision, null, wfWikiID()
+ $this->mTitle,
+ $revision,
+ null,
+ WikiMap::getCurrentWikiDbDomain()->getId()
);
// Reset this object and the Title object
// means that some cache invalidations happen that are not strictly needed.
$cache->makeGlobalKey(
'interwiki-page',
- WikiMap::getCurrentWikiDomain()->getId(),
+ WikiMap::getCurrentWikiDbDomain()->getId(),
$title->getDBkey()
)
);
$deps = [];
# Loop to fetch the article, with up to 1 redirect
- // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
for ( $i = 0; $i < 2 && is_object( $title ); $i++ ) {
# Give extensions a chance to select the revision instead
$id = false; # Assume current
$anchor = $safeHeadline;
$fallbackAnchor = $fallbackHeadline;
if ( isset( $refers[$arrayKey] ) ) {
- // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall,Generic.Formatting.DisallowMultipleStatements
+ // phpcs:ignore Generic.Formatting.DisallowMultipleStatements
for ( $i = 2; isset( $refers["${arrayKey}_$i"] ); ++$i );
$anchor .= "_$i";
$linkAnchor .= "_$i";
$refers[$arrayKey] = true;
}
if ( $fallbackHeadline !== false && isset( $refers[$fallbackArrayKey] ) ) {
- // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall,Generic.Formatting.DisallowMultipleStatements
+ // phpcs:ignore Generic.Formatting.DisallowMultipleStatements
for ( $i = 2; isset( $refers["${fallbackArrayKey}_$i"] ); ++$i );
$fallbackAnchor .= "_$i";
$refers["${fallbackArrayKey}_$i"] = true;
// (although "block-level" is not technically defined for elements that are
// new in HTML5).
// Structured as tag => true to allow O(1) membership test.
- static private $BLOCK_LEVEL_TAGS = [
+ private static $BLOCK_LEVEL_TAGS = [
'address' => true,
'article' => true,
'aside' => true,
*/
public function getProfileID() {
if ( $this->profileID === false ) {
- return WikiMap::getCurrentWikiDomain()->getId();
+ return WikiMap::getCurrentWikiDbDomain()->getId();
} else {
return $this->profileID;
}
$level = $stack[$start][1];
$count = 0;
for ( $i = $start - 1; $i >= 0 && $stack[$i][1] > $level; $i-- ) {
- $count ++;
+ $count++;
}
return $count;
}
$packet['server_name'] = $wgServerName;
$packet['server_script_path'] = $wgScriptPath ?: '/';
- $packet['wiki'] = WikiMap::getWikiIdFromDomain( WikiMap::getCurrentWikiDomain() );
+ $packet['wiki'] = WikiMap::getWikiIdFromDbDomain( WikiMap::getCurrentWikiDbDomain() );
return $this->formatArray( $packet );
}
}
$illegalFileChars = $conf->get( 'IllegalFileChars' );
- $oldCommentSchema = $conf->get( 'CommentTableSchemaMigrationStage' ) === MIGRATION_OLD;
// Build list of variables
$skin = $context->getSkin();
'wgResourceLoaderStorageEnabled' => $conf->get( 'ResourceLoaderStorageEnabled' ),
'wgForeignUploadTargets' => $conf->get( 'ForeignUploadTargets' ),
'wgEnableUploads' => $conf->get( 'EnableUploads' ),
- 'wgCommentByteLimit' => $oldCommentSchema ? 255 : null,
- 'wgCommentCodePointLimit' => $oldCommentSchema ? null : CommentStore::COMMENT_CHARACTER_LIMIT,
+ 'wgCommentByteLimit' => null,
+ 'wgCommentCodePointLimit' => CommentStore::COMMENT_CHARACTER_LIMIT,
];
Hooks::run( 'ResourceLoaderGetConfigVars', [ &$vars, $skin ] );
* @param Title $title
* @param Revision|null $old Prior page revision
* @param Revision|null $new New page revision
- * @param string $wikiId
+ * @param string $domain Database domain ID
* @since 1.28
*/
public static function invalidateModuleCache(
- Title $title, Revision $old = null, Revision $new = null, $wikiId
+ Title $title, Revision $old = null, Revision $new = null, $domain
) {
static $formats = [ CONTENT_FORMAT_CSS, CONTENT_FORMAT_JAVASCRIPT ];
- Assert::parameterType( 'string', $wikiId, '$wikiId' );
+ Assert::parameterType( 'string', $domain, '$domain' );
// TODO: MCR: differentiate between page functionality and content model!
// Not all pages containing CSS or JS have to be modules! [PageType]
if ( $purge ) {
$cache = ObjectCache::getMainWANInstance();
- $key = $cache->makeGlobalKey( 'resourceloader', 'titleinfo', $wikiId );
+ $key = $cache->makeGlobalKey( 'resourceloader', 'titleinfo', $domain );
$cache->touchCheckKey( $key );
}
}
# $res might contain the whole 1,000 rows, so we read up to
# $num [should update this to use a Pager]
- // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
for ( $i = 0; $i < $num && $row = $res->fetchObject(); $i++ ) {
$line = $this->formatResult( $skin, $row );
if ( $line ) {
$suggestedDurations = self::getSuggestedDurations();
$conf = $this->getConfig();
- $oldCommentSchema = $conf->get( 'CommentTableSchemaMigrationStage' ) === MIGRATION_OLD;
$enablePartialBlocks = $conf->get( 'EnablePartialBlocks' );
$a = [];
'type' => 'selectandother',
// HTML maxlength uses "UTF-16 code units", which means that characters outside BMP
// (e.g. emojis) count for two each. This limit is overridden in JS to instead count
- // Unicode codepoints (or 255 UTF-8 bytes for old schema).
- 'maxlength' => $oldCommentSchema ? 255 : CommentStore::COMMENT_CHARACTER_LIMIT,
+ // Unicode codepoints.
+ 'maxlength' => CommentStore::COMMENT_CHARACTER_LIMIT,
'maxlength-unit' => 'codepoints',
'options-message' => 'ipbreason-dropdown',
'section' => 'reason',
$numRevisions = 0;
// Live revisions...
$list = $this->getList();
- // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
for ( $list->reset(); $list->current(); $list->next() ) {
$item = $list->current();
$numRevisions++;
// Show form if the user can submit
if ( $this->isAllowed ) {
- $conf = $this->getConfig();
- $oldCommentSchema = $conf->get( 'CommentTableSchemaMigrationStage' ) === MIGRATION_OLD;
-
$form = Xml::openElement( 'form', [ 'method' => 'post',
'action' => $this->getPageTitle()->getLocalURL( [ 'action' => 'submit' ] ),
'id' => 'mw-revdel-form-revisions' ] ) .
'id' => 'wpReason',
// HTML maxlength uses "UTF-16 code units", which means that characters outside BMP
// (e.g. emojis) count for two each. This limit is overridden in JS to instead count
- // Unicode codepoints (or 255 UTF-8 bytes for old schema).
+ // Unicode codepoints.
// "- 155" is to leave room for the auto-generated part of the log entry.
- 'maxlength' => $oldCommentSchema ? 100 : CommentStore::COMMENT_CHARACTER_LIMIT - 155,
+ 'maxlength' => CommentStore::COMMENT_CHARACTER_LIMIT - 155,
] ) .
'</td>' .
"</tr><tr>\n" .
// Otherwise, use a multi-select field for adding tags, and a list of
// checkboxes for removing them
- // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
for ( $list->reset(); $list->current(); $list->next() ) {
$currentTags = $list->current()->getTags();
if ( $currentTags ) {
// HTML maxlength uses "UTF-16 code units", which means that characters outside BMP
// (e.g. emojis) count for two each. This limit is overridden in JS to instead count
- // Unicode codepoints (or 255 UTF-8 bytes for old schema).
- $conf = $this->getConfig();
- $oldCommentSchema = $conf->get( 'CommentTableSchemaMigrationStage' ) === MIGRATION_OLD;
+ // Unicode codepoints.
$fields[] = new OOUI\FieldLayout(
new OOUI\TextInputWidget( [
'name' => 'wpReason',
'id' => 'wpReason',
- 'maxLength' => $oldCommentSchema ? 200 : CommentStore::COMMENT_CHARACTER_LIMIT,
+ 'maxLength' => CommentStore::COMMENT_CHARACTER_LIMIT,
'infusable' => true,
'value' => $this->reason,
] ),
$numRevisions = 0;
// Live revisions...
$list = $this->getList();
- // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
for ( $list->reset(); $list->current(); $list->next() ) {
$item = $list->current();
$out->addModules( [ 'mediawiki.special.revisionDelete' ] );
$out->addModuleStyles( 'mediawiki.special' );
- $conf = $this->getConfig();
- $oldCommentSchema = $conf->get( 'CommentTableSchemaMigrationStage' ) === MIGRATION_OLD;
-
$form = Xml::openElement( 'form', [ 'method' => 'post',
'action' => $this->getPageTitle()->getLocalURL( [ 'action' => 'submit' ] ),
'id' => 'mw-revdel-form-revisions' ] ) .
'id' => 'wpReason',
// HTML maxlength uses "UTF-16 code units", which means that characters outside BMP
// (e.g. emojis) count for two each. This limit is overridden in JS to instead count
- // Unicode codepoints (or 255 UTF-8 bytes for old schema).
+ // Unicode codepoints.
// "- 155" is to leave room for the 'wpRevDeleteReasonList' value.
- 'maxlength' => $oldCommentSchema ? 100 : CommentStore::COMMENT_CHARACTER_LIMIT - 155,
+ 'maxlength' => CommentStore::COMMENT_CHARACTER_LIMIT - 155,
] ) .
'</td>' .
"</tr><tr>\n" .
'content' => new OOUI\HtmlSnippet( $this->msg( 'undeleteextrahelp' )->parseAsBlock() )
] );
- $conf = $this->getConfig();
- $oldCommentSchema = $conf->get( 'CommentTableSchemaMigrationStage' ) === MIGRATION_OLD;
-
$fields[] = new OOUI\FieldLayout(
new OOUI\TextInputWidget( [
'name' => 'wpComment',
'autofocus' => true,
// HTML maxlength uses "UTF-16 code units", which means that characters outside BMP
// (e.g. emojis) count for two each. This limit is overridden in JS to instead count
- // Unicode codepoints (or 255 UTF-8 bytes for old schema).
- 'maxLength' => $oldCommentSchema ? 255 : CommentStore::COMMENT_CHARACTER_LIMIT,
+ // Unicode codepoints.
+ 'maxLength' => CommentStore::COMMENT_CHARACTER_LIMIT,
] ),
[
'label' => $this->msg( 'undeletecomment' )->text(),
return true;
}
}
-
-/**
- * @ingroup SpecialPage
- * @ingroup Upload
- */
-class SpecialUploadStashTooLargeException extends UploadStashException {
-}
->rawParams( $userToolLinks )->parse()
);
if ( $canChangeAny ) {
- $conf = $this->getConfig();
- $oldCommentSchema = $conf->get( 'CommentTableSchemaMigrationStage' ) === MIGRATION_OLD;
$this->getOutput()->addHTML(
$this->msg( 'userrights-groups-help', $user->getName() )->parse() .
$grouplist .
'id' => 'wpReason',
// HTML maxlength uses "UTF-16 code units", which means that characters outside BMP
// (e.g. emojis) count for two each. This limit is overridden in JS to instead count
- // Unicode codepoints (or 255 UTF-8 bytes for old schema).
- 'maxlength' => $oldCommentSchema ? 255 : CommentStore::COMMENT_CHARACTER_LIMIT,
+ // Unicode codepoints.
+ 'maxlength' => CommentStore::COMMENT_CHARACTER_LIMIT,
] ) .
"</td>
</tr>
--- /dev/null
+<?php
+/**
+ * Implements SpecialUploadStashTooLargeException
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * @ingroup SpecialPage
+ * @ingroup Upload
+ */
+class SpecialUploadStashTooLargeException extends UploadStashException {
+}
return 'qcc_title';
}
- function getQueryInfo() {
+ function getQueryInfo( $data = null ) {
$dbr = $this->getDatabase();
- $rcQuery = ActorMigration::newMigration()->getJoin( 'rc_user' );
+ $useActor = (bool)(
+ $this->getConfig()->get( 'ActorTableSchemaMigrationStage' ) & SCHEMA_COMPAT_READ_NEW
+ );
$activeUserSeconds = $this->getConfig()->get( 'ActiveUserDays' ) * 86400;
$timestamp = $dbr->timestamp( wfTimestamp( TS_UNIX ) - $activeUserSeconds );
- $tables = [ 'querycachetwo', 'user', 'rc' => [ 'recentchanges' ] + $rcQuery['tables'] ];
+ $fname = __METHOD__ . ' (' . $this->getSqlComment() . ')';
+
+ // Inner subselect to pull the active users out of querycachetwo
+ $tables = [ 'querycachetwo', 'user' ];
+ $fields = [ 'qcc_title', 'user_id' ];
$jconds = [
'user' => [ 'JOIN', 'user_name = qcc_title' ],
- 'rc' => [ 'JOIN', $rcQuery['fields']['rc_user_text'] . ' = qcc_title' ],
- ] + $rcQuery['joins'];
+ ];
$conds = [
'qcc_type' => 'activeusers',
'qcc_namespace' => NS_USER,
- 'rc_type != ' . $dbr->addQuotes( RC_EXTERNAL ), // Don't count wikidata.
- 'rc_type != ' . $dbr->addQuotes( RC_CATEGORIZE ), // Don't count categorization changes.
- 'rc_log_type IS NULL OR rc_log_type != ' . $dbr->addQuotes( 'newusers' ),
- 'rc_timestamp >= ' . $dbr->addQuotes( $timestamp ),
];
+ $options = [];
+ if ( $data !== null ) {
+ $options['ORDER BY'] = 'qcc_title ' . $data['dir'];
+ $options['LIMIT'] = $data['limit'];
+ $conds = array_merge( $conds, $data['conds'] );
+ }
if ( $this->requestedUser != '' ) {
$conds[] = 'qcc_title >= ' . $dbr->addQuotes( $this->requestedUser );
}
if ( $this->groups !== [] ) {
- $tables[] = 'user_groups';
- $jconds['user_groups'] = [ 'JOIN', [ 'ug_user = user_id' ] ];
- $conds['ug_group'] = $this->groups;
- $conds[] = 'ug_expiry IS NULL OR ug_expiry >= ' . $dbr->addQuotes( $dbr->timestamp() );
+ $tables['ug1'] = 'user_groups';
+ $jconds['ug1'] = [ 'JOIN', 'ug1.ug_user = user_id' ];
+ $conds['ug1.ug_group'] = $this->groups;
+ $conds[] = 'ug1.ug_expiry IS NULL OR ug1.ug_expiry >= ' . $dbr->addQuotes( $dbr->timestamp() );
}
if ( $this->excludegroups !== [] ) {
- foreach ( $this->excludegroups as $group ) {
- $conds[] = 'NOT EXISTS (' . $dbr->selectSQLText(
- 'user_groups', '1', [
- 'ug_user = user_id',
- 'ug_group' => $group,
- 'ug_expiry IS NULL OR ug_expiry >= ' . $dbr->addQuotes( $dbr->timestamp() )
- ]
- ) . ')';
- }
+ $tables['ug2'] = 'user_groups';
+ $jconds['ug2'] = [ 'LEFT JOIN', [
+ 'ug2.ug_user = user_id',
+ 'ug2.ug_group' => $this->excludegroups,
+ 'ug2.ug_expiry IS NULL OR ug2.ug_expiry >= ' . $dbr->addQuotes( $dbr->timestamp() ),
+ ] ];
+ $conds['ug2.ug_user'] = null;
}
if ( !$this->getUser()->isAllowed( 'hideuser' ) ) {
$conds[] = 'NOT EXISTS (' . $dbr->selectSQLText(
'ipblocks', '1', [ 'ipb_user=user_id', 'ipb_deleted' => 1 ]
) . ')';
}
+ if ( $useActor ) {
+ $tables[] = 'actor';
+ $jconds['actor'] = [
+ 'JOIN',
+ 'actor_user = user_id',
+ ];
+ $fields[] = 'actor_id';
+ }
+ $subquery = $dbr->buildSelectSubquery( $tables, $fields, $conds, $fname, $options, $jconds );
+
+ // Outer query to select the recent edit counts for the selected active users
+ $tables = [ 'qcc_users' => $subquery, 'recentchanges' ];
+ $jconds = [ 'recentchanges' => [
+ 'JOIN', $useActor ? 'rc_actor = actor_id' : 'rc_user_text = qcc_title',
+ ] ];
+ $conds = [
+ 'rc_type != ' . $dbr->addQuotes( RC_EXTERNAL ), // Don't count wikidata.
+ 'rc_type != ' . $dbr->addQuotes( RC_CATEGORIZE ), // Don't count categorization changes.
+ 'rc_log_type IS NULL OR rc_log_type != ' . $dbr->addQuotes( 'newusers' ),
+ 'rc_timestamp >= ' . $dbr->addQuotes( $timestamp ),
+ ];
return [
'tables' => $tables,
'fields' => [
'qcc_title',
'user_name' => 'qcc_title',
- 'user_id' => 'MAX(user_id)',
+ 'user_id' => 'user_id',
'recentedits' => 'COUNT(*)'
],
'options' => [ 'GROUP BY' => [ 'qcc_title' ] ],
];
}
+ protected function buildQueryInfo( $offset, $limit, $descending ) {
+ $fname = __METHOD__ . ' (' . $this->getSqlComment() . ')';
+
+ $sortColumns = array_merge( [ $this->mIndexField ], $this->mExtraSortFields );
+ if ( $descending ) {
+ $orderBy = $sortColumns;
+ $operator = $this->mIncludeOffset ? '>=' : '>';
+ } else {
+ $orderBy = [];
+ foreach ( $sortColumns as $col ) {
+ $orderBy[] = $col . ' DESC';
+ }
+ $operator = $this->mIncludeOffset ? '<=' : '<';
+ }
+ $info = $this->getQueryInfo( [
+ 'limit' => intval( $limit ),
+ 'order' => $descending ? 'DESC' : 'ASC',
+ 'conds' =>
+ $offset != '' ? [ $this->mIndexField . $operator . $this->mDb->addQuotes( $offset ) ] : [],
+ ] );
+
+ $tables = $info['tables'];
+ $fields = $info['fields'];
+ $conds = $info['conds'];
+ $options = $info['options'];
+ $join_conds = $info['join_conds'];
+ $options['ORDER BY'] = $orderBy;
+ return [ $tables, $fields, $conds, $fname, $options, $join_conds ];
+ }
+
protected function doBatchLookups() {
parent::doBatchLookups();
}
}
}
-
-class UploadChunkZeroLengthFileException extends MWException {
-}
-
-class UploadChunkFileException extends MWException {
-}
-
-class UploadChunkVerificationException extends MWException {
- public $msg;
- public function __construct( array $res ) {
- $this->msg = wfMessage( ...$res );
- parent::__construct( wfMessage( ...$res )
- ->inLanguage( 'en' )->useDatabase( false )->text() );
- }
-}
return $this->repo->fileExists( $this->path );
}
}
-
-/**
- * @ingroup Upload
- */
-class UploadStashException extends MWException implements ILocalizedException {
- /** @var string|array|MessageSpecifier */
- protected $messageSpec;
-
- /**
- * @param string|array|MessageSpecifier $messageSpec See Message::newFromSpecifier
- * @param int $code Exception code
- * @param Exception|Throwable|null $previous The previous exception used for the exception
- * chaining.
- */
- public function __construct( $messageSpec, $code = 0, $previous = null ) {
- $this->messageSpec = $messageSpec;
-
- $msg = $this->getMessageObject()->text();
- $msg = preg_replace( '!</?(var|kbd|samp|code)>!', '"', $msg );
- $msg = Sanitizer::stripAllTags( $msg );
- parent::__construct( $msg, $code, $previous );
- }
-
- public function getMessageObject() {
- return Message::newFromSpecifier( $this->messageSpec );
- }
-}
-
-/**
- * @ingroup Upload
- */
-class UploadStashFileNotFoundException extends UploadStashException {
-}
-
-/**
- * @ingroup Upload
- */
-class UploadStashBadPathException extends UploadStashException {
-}
-
-/**
- * @ingroup Upload
- */
-class UploadStashFileException extends UploadStashException {
-}
-
-/**
- * @ingroup Upload
- */
-class UploadStashZeroLengthFileException extends UploadStashException {
-}
-
-/**
- * @ingroup Upload
- */
-class UploadStashNotLoggedInException extends UploadStashException {
-}
-
-/**
- * @ingroup Upload
- */
-class UploadStashWrongOwnerException extends UploadStashException {
-}
-
-/**
- * @ingroup Upload
- */
-class UploadStashNoSuchKeyException extends UploadStashException {
-}
--- /dev/null
+<?php
+/**
+ * Implements UploadChunkFileException
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Upload
+ */
+
+class UploadChunkFileException extends MWException {
+}
--- /dev/null
+<?php
+/**
+ * Implements UploadChunkVerificationException
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Upload
+ */
+
+class UploadChunkVerificationException extends MWException {
+ public $msg;
+ public function __construct( array $res ) {
+ $this->msg = wfMessage( ...$res );
+ parent::__construct( wfMessage( ...$res )
+ ->inLanguage( 'en' )->useDatabase( false )->text() );
+ }
+}
--- /dev/null
+<?php
+/**
+ * Implements UploadChunkZeroLengthFileException
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Upload
+ */
+
+class UploadChunkZeroLengthFileException extends MWException {
+}
--- /dev/null
+<?php
+/**
+ * Implements UploadStashBadPathException
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * @ingroup Upload
+ */
+class UploadStashBadPathException extends UploadStashException {
+}
--- /dev/null
+<?php
+/**
+ * Implements UploadStashException
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * @ingroup Upload
+ */
+class UploadStashException extends MWException implements ILocalizedException {
+ /** @var string|array|MessageSpecifier */
+ protected $messageSpec;
+
+ /**
+ * @param string|array|MessageSpecifier $messageSpec See Message::newFromSpecifier
+ * @param int $code Exception code
+ * @param Exception|Throwable|null $previous The previous exception used for the exception
+ * chaining.
+ */
+ public function __construct( $messageSpec, $code = 0, $previous = null ) {
+ $this->messageSpec = $messageSpec;
+
+ $msg = $this->getMessageObject()->text();
+ $msg = preg_replace( '!</?(var|kbd|samp|code)>!', '"', $msg );
+ $msg = Sanitizer::stripAllTags( $msg );
+ parent::__construct( $msg, $code, $previous );
+ }
+
+ public function getMessageObject() {
+ return Message::newFromSpecifier( $this->messageSpec );
+ }
+}
--- /dev/null
+<?php
+/**
+ * Implements UploadStashFileException
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * @ingroup Upload
+ */
+class UploadStashFileException extends UploadStashException {
+}
--- /dev/null
+<?php
+/**
+ * Implements UploadStashFileNotFoundException
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * @ingroup Upload
+ */
+class UploadStashFileNotFoundException extends UploadStashException {
+}
--- /dev/null
+<?php
+/**
+ * Implements UploadStashNoSuchKeyException
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * @ingroup Upload
+ */
+class UploadStashNoSuchKeyException extends UploadStashException {
+}
--- /dev/null
+<?php
+/**
+ * Implements UploadStashNotLoggedInException
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * @ingroup Upload
+ */
+class UploadStashNotLoggedInException extends UploadStashException {
+}
--- /dev/null
+<?php
+/**
+ * Implements UploadStashWrongOwnerException
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * @ingroup Upload
+ */
+class UploadStashWrongOwnerException extends UploadStashException {
+}
--- /dev/null
+<?php
+/**
+ * Implements UploadStashZeroLengthFileException
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * @ingroup Upload
+ */
+class UploadStashZeroLengthFileException extends UploadStashException {
+}
* @return string
*/
protected function getCacheKey( WANObjectCache $cache ) {
- $cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
return $cache->makeGlobalKey( 'user', 'id', $lbFactory->getLocalDomainID(), $this->mId );
* @since 1.25
*/
protected function loadFromCache() {
- $cache = ObjectCache::getMainWANInstance();
+ $cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
$data = $cache->getWithSetCallback(
$this->getCacheKey( $cache ),
$cache::TTL_HOUR,
$rev = $timestamp ? Revision::loadFromTimestamp( $dbr, $utp, $timestamp ) : null;
return [
[
- 'wiki' => WikiMap::getWikiIdFromDomain( WikiMap::getCurrentWikiDomain() ),
+ 'wiki' => WikiMap::getWikiIdFromDbDomain( WikiMap::getCurrentWikiDbDomain() ),
'link' => $utp->getLocalURL(),
'rev' => $rev
]
return;
}
- $cache = ObjectCache::getMainWANInstance();
+ $cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
$key = $this->getCacheKey( $cache );
if ( $mode === 'refresh' ) {
$cache->delete( $key, 1 );
return false;
}
- if ( ! Hooks::run( 'BeforeResetNotificationTimestamp', [ &$user, &$title, $force, &$oldid ] ) ) {
+ if ( !Hooks::run( 'BeforeResetNotificationTimestamp', [ &$user, &$title, $force, &$oldid ] ) ) {
return false;
}
/**
* @var LocalisationCache
*/
- static public $dataCache;
+ public static $dataCache;
- static public $mLangObjCache = [];
+ public static $mLangObjCache = [];
/**
* Return a fallback chain for messages in getFallbacksFor
*/
const STRICT_FALLBACKS = 1;
- static public $mWeekdayMsgs = [
+ public static $mWeekdayMsgs = [
'sunday', 'monday', 'tuesday', 'wednesday', 'thursday',
'friday', 'saturday'
];
- static public $mWeekdayAbbrevMsgs = [
+ public static $mWeekdayAbbrevMsgs = [
'sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'
];
- static public $mMonthMsgs = [
+ public static $mMonthMsgs = [
'january', 'february', 'march', 'april', 'may_long', 'june',
'july', 'august', 'september', 'october', 'november',
'december'
];
- static public $mMonthGenMsgs = [
+ public static $mMonthGenMsgs = [
'january-gen', 'february-gen', 'march-gen', 'april-gen', 'may-gen', 'june-gen',
'july-gen', 'august-gen', 'september-gen', 'october-gen', 'november-gen',
'december-gen'
];
- static public $mMonthAbbrevMsgs = [
+ public static $mMonthAbbrevMsgs = [
'jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug',
'sep', 'oct', 'nov', 'dec'
];
- static public $mIranianCalendarMonthMsgs = [
+ public static $mIranianCalendarMonthMsgs = [
'iranian-calendar-m1', 'iranian-calendar-m2', 'iranian-calendar-m3',
'iranian-calendar-m4', 'iranian-calendar-m5', 'iranian-calendar-m6',
'iranian-calendar-m7', 'iranian-calendar-m8', 'iranian-calendar-m9',
'iranian-calendar-m10', 'iranian-calendar-m11', 'iranian-calendar-m12'
];
- static public $mHebrewCalendarMonthMsgs = [
+ public static $mHebrewCalendarMonthMsgs = [
'hebrew-calendar-m1', 'hebrew-calendar-m2', 'hebrew-calendar-m3',
'hebrew-calendar-m4', 'hebrew-calendar-m5', 'hebrew-calendar-m6',
'hebrew-calendar-m7', 'hebrew-calendar-m8', 'hebrew-calendar-m9',
'hebrew-calendar-m6a', 'hebrew-calendar-m6b'
];
- static public $mHebrewCalendarMonthGenMsgs = [
+ public static $mHebrewCalendarMonthGenMsgs = [
'hebrew-calendar-m1-gen', 'hebrew-calendar-m2-gen', 'hebrew-calendar-m3-gen',
'hebrew-calendar-m4-gen', 'hebrew-calendar-m5-gen', 'hebrew-calendar-m6-gen',
'hebrew-calendar-m7-gen', 'hebrew-calendar-m8-gen', 'hebrew-calendar-m9-gen',
'hebrew-calendar-m6a-gen', 'hebrew-calendar-m6b-gen'
];
- static public $mHijriCalendarMonthMsgs = [
+ public static $mHijriCalendarMonthMsgs = [
'hijri-calendar-m1', 'hijri-calendar-m2', 'hijri-calendar-m3',
'hijri-calendar-m4', 'hijri-calendar-m5', 'hijri-calendar-m6',
'hijri-calendar-m7', 'hijri-calendar-m8', 'hijri-calendar-m9',
* @since 1.20
* @var array
*/
- static public $durationIntervals = [
+ public static $durationIntervals = [
'millennia' => 31556952000,
'centuries' => 3155695200,
'decades' => 315569520,
* @since 1.21
* @var array
*/
- static private $fallbackLanguageCache = [];
+ private static $fallbackLanguageCache = [];
/**
* Cache for grammar rules data
* @var MapCacheLRU|null
*/
- static private $grammarTransformations;
+ private static $grammarTransformations;
/**
* Cache for language names
* @var HashBagOStuff|null
*/
- static private $languageNameCache;
+ private static $languageNameCache;
/**
* Unicode directional formatting characters, for embedBidi()
*/
- static private $lre = "\u{202A}"; // U+202A LEFT-TO-RIGHT EMBEDDING
- static private $rle = "\u{202B}"; // U+202B RIGHT-TO-LEFT EMBEDDING
- static private $pdf = "\u{202C}"; // U+202C POP DIRECTIONAL FORMATTING
+ private static $lre = "\u{202A}"; // U+202A LEFT-TO-RIGHT EMBEDDING
+ private static $rle = "\u{202B}"; // U+202B RIGHT-TO-LEFT EMBEDDING
+ private static $pdf = "\u{202C}"; // U+202C POP DIRECTIONAL FORMATTING
/**
* Directionality test regex for embedBidi(). Matches the first strong directionality codepoint:
*/
// @codeCoverageIgnoreStart
// phpcs:ignore Generic.Files.LineLength
- static private $strongDirRegex = '/(?:([\x{41}-\x{5a}\x{61}-\x{7a}\x{aa}\x{b5}\x{ba}\x{c0}-\x{d6}\x{d8}-\x{f6}\x{f8}-\x{2b8}\x{2bb}-\x{2c1}\x{2d0}\x{2d1}\x{2e0}-\x{2e4}\x{2ee}\x{370}-\x{373}\x{376}\x{377}\x{37a}-\x{37d}\x{37f}\x{386}\x{388}-\x{38a}\x{38c}\x{38e}-\x{3a1}\x{3a3}-\x{3f5}\x{3f7}-\x{482}\x{48a}-\x{52f}\x{531}-\x{556}\x{559}-\x{55f}\x{561}-\x{587}\x{589}\x{903}-\x{939}\x{93b}\x{93d}-\x{940}\x{949}-\x{94c}\x{94e}-\x{950}\x{958}-\x{961}\x{964}-\x{980}\x{982}\x{983}\x{985}-\x{98c}\x{98f}\x{990}\x{993}-\x{9a8}\x{9aa}-\x{9b0}\x{9b2}\x{9b6}-\x{9b9}\x{9bd}-\x{9c0}\x{9c7}\x{9c8}\x{9cb}\x{9cc}\x{9ce}\x{9d7}\x{9dc}\x{9dd}\x{9df}-\x{9e1}\x{9e6}-\x{9f1}\x{9f4}-\x{9fa}\x{a03}\x{a05}-\x{a0a}\x{a0f}\x{a10}\x{a13}-\x{a28}\x{a2a}-\x{a30}\x{a32}\x{a33}\x{a35}\x{a36}\x{a38}\x{a39}\x{a3e}-\x{a40}\x{a59}-\x{a5c}\x{a5e}\x{a66}-\x{a6f}\x{a72}-\x{a74}\x{a83}\x{a85}-\x{a8d}\x{a8f}-\x{a91}\x{a93}-\x{aa8}\x{aaa}-\x{ab0}\x{ab2}\x{ab3}\x{ab5}-\x{ab9}\x{abd}-\x{ac0}\x{ac9}\x{acb}\x{acc}\x{ad0}\x{ae0}\x{ae1}\x{ae6}-\x{af0}\x{af9}\x{b02}\x{b03}\x{b05}-\x{b0c}\x{b0f}\x{b10}\x{b13}-\x{b28}\x{b2a}-\x{b30}\x{b32}\x{b33}\x{b35}-\x{b39}\x{b3d}\x{b3e}\x{b40}\x{b47}\x{b48}\x{b4b}\x{b4c}\x{b57}\x{b5c}\x{b5d}\x{b5f}-\x{b61}\x{b66}-\x{b77}\x{b83}\x{b85}-\x{b8a}\x{b8e}-\x{b90}\x{b92}-\x{b95}\x{b99}\x{b9a}\x{b9c}\x{b9e}\x{b9f}\x{ba3}\x{ba4}\x{ba8}-\x{baa}\x{bae}-\x{bb9}\x{bbe}\x{bbf}\x{bc1}\x{bc2}\x{bc6}-\x{bc8}\x{bca}-\x{bcc}\x{bd0}\x{bd7}\x{be6}-\x{bf2}\x{c01}-\x{c03}\x{c05}-\x{c0c}\x{c0e}-\x{c10}\x{c12}-\x{c28}\x{c2a}-\x{c39}\x{c3d}\x{c41}-\x{c44}\x{c58}-\x{c5a}\x{c60}\x{c61}\x{c66}-\x{c6f}\x{c7f}\x{c82}\x{c83}\x{c85}-\x{c8c}\x{c8e}-\x{c90}\x{c92}-\x{ca8}\x{caa}-\x{cb3}\x{cb5}-\x{cb9}\x{cbd}-\x{cc4}\x{cc6}-\x{cc8}\x{cca}\x{ccb}\x{cd5}\x{cd6}\x{cde}\x{ce0}\x{ce1}\x{ce6}-\x{cef}\x{cf1}\x{cf2}\x{d02}\x{d03}\x{d05}-\x{d0c}\x{d0e}-\x{d10}\x{d12}-\x{d3a}\x{d3d}-\x{d40}\x{d46}-\x{d48}\x{d4a}-\x{d4c}\x{d4e}\x{d57}\x{d5f}-\x{d61}\x{d66}-\x{d75}\x{d79}-\x{d7f}\x{d82}\x{d83}\x{d85}-\x{d96}\x{d9a}-\x{db1}\x{db3}-\x{dbb}\x{dbd}\x{dc0}-\x{dc6}\x{dcf}-\x{dd1}\x{dd8}-\x{ddf}\x{de6}-\x{def}\x{df2}-\x{df4}\x{e01}-\x{e30}\x{e32}\x{e33}\x{e40}-\x{e46}\x{e4f}-\x{e5b}\x{e81}\x{e82}\x{e84}\x{e87}\x{e88}\x{e8a}\x{e8d}\x{e94}-\x{e97}\x{e99}-\x{e9f}\x{ea1}-\x{ea3}\x{ea5}\x{ea7}\x{eaa}\x{eab}\x{ead}-\x{eb0}\x{eb2}\x{eb3}\x{ebd}\x{ec0}-\x{ec4}\x{ec6}\x{ed0}-\x{ed9}\x{edc}-\x{edf}\x{f00}-\x{f17}\x{f1a}-\x{f34}\x{f36}\x{f38}\x{f3e}-\x{f47}\x{f49}-\x{f6c}\x{f7f}\x{f85}\x{f88}-\x{f8c}\x{fbe}-\x{fc5}\x{fc7}-\x{fcc}\x{fce}-\x{fda}\x{1000}-\x{102c}\x{1031}\x{1038}\x{103b}\x{103c}\x{103f}-\x{1057}\x{105a}-\x{105d}\x{1061}-\x{1070}\x{1075}-\x{1081}\x{1083}\x{1084}\x{1087}-\x{108c}\x{108e}-\x{109c}\x{109e}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1360}-\x{137c}\x{1380}-\x{138f}\x{13a0}-\x{13f5}\x{13f8}-\x{13fd}\x{1401}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16f8}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1735}\x{1736}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17b6}\x{17be}-\x{17c5}\x{17c7}\x{17c8}\x{17d4}-\x{17da}\x{17dc}\x{17e0}-\x{17e9}\x{1810}-\x{1819}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191e}\x{1923}-\x{1926}\x{1929}-\x{192b}\x{1930}\x{1931}\x{1933}-\x{1938}\x{1946}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19b0}-\x{19c9}\x{19d0}-\x{19da}\x{1a00}-\x{1a16}\x{1a19}\x{1a1a}\x{1a1e}-\x{1a55}\x{1a57}\x{1a61}\x{1a63}\x{1a64}\x{1a6d}-\x{1a72}\x{1a80}-\x{1a89}\x{1a90}-\x{1a99}\x{1aa0}-\x{1aad}\x{1b04}-\x{1b33}\x{1b35}\x{1b3b}\x{1b3d}-\x{1b41}\x{1b43}-\x{1b4b}\x{1b50}-\x{1b6a}\x{1b74}-\x{1b7c}\x{1b82}-\x{1ba1}\x{1ba6}\x{1ba7}\x{1baa}\x{1bae}-\x{1be5}\x{1be7}\x{1bea}-\x{1bec}\x{1bee}\x{1bf2}\x{1bf3}\x{1bfc}-\x{1c2b}\x{1c34}\x{1c35}\x{1c3b}-\x{1c49}\x{1c4d}-\x{1c7f}\x{1cc0}-\x{1cc7}\x{1cd3}\x{1ce1}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf3}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{200e}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{214f}\x{2160}-\x{2188}\x{2336}-\x{237a}\x{2395}\x{249c}-\x{24e9}\x{26ac}\x{2800}-\x{28ff}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d70}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{302e}\x{302f}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{3190}-\x{31ba}\x{31f0}-\x{321c}\x{3220}-\x{324f}\x{3260}-\x{327b}\x{327f}-\x{32b0}\x{32c0}-\x{32cb}\x{32d0}-\x{32fe}\x{3300}-\x{3376}\x{337b}-\x{33dd}\x{33e0}-\x{33fe}\x{3400}-\x{4db5}\x{4e00}-\x{9fd5}\x{a000}-\x{a48c}\x{a4d0}-\x{a60c}\x{a610}-\x{a62b}\x{a640}-\x{a66e}\x{a680}-\x{a69d}\x{a6a0}-\x{a6ef}\x{a6f2}-\x{a6f7}\x{a722}-\x{a787}\x{a789}-\x{a7ad}\x{a7b0}-\x{a7b7}\x{a7f7}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a824}\x{a827}\x{a830}-\x{a837}\x{a840}-\x{a873}\x{a880}-\x{a8c3}\x{a8ce}-\x{a8d9}\x{a8f2}-\x{a8fd}\x{a900}-\x{a925}\x{a92e}-\x{a946}\x{a952}\x{a953}\x{a95f}-\x{a97c}\x{a983}-\x{a9b2}\x{a9b4}\x{a9b5}\x{a9ba}\x{a9bb}\x{a9bd}-\x{a9cd}\x{a9cf}-\x{a9d9}\x{a9de}-\x{a9e4}\x{a9e6}-\x{a9fe}\x{aa00}-\x{aa28}\x{aa2f}\x{aa30}\x{aa33}\x{aa34}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa4d}\x{aa50}-\x{aa59}\x{aa5c}-\x{aa7b}\x{aa7d}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aaeb}\x{aaee}-\x{aaf5}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{ab30}-\x{ab65}\x{ab70}-\x{abe4}\x{abe6}\x{abe7}\x{abe9}-\x{abec}\x{abf0}-\x{abf9}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{e000}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}\x{10000}-\x{1000b}\x{1000d}-\x{10026}\x{10028}-\x{1003a}\x{1003c}\x{1003d}\x{1003f}-\x{1004d}\x{10050}-\x{1005d}\x{10080}-\x{100fa}\x{10100}\x{10102}\x{10107}-\x{10133}\x{10137}-\x{1013f}\x{101d0}-\x{101fc}\x{10280}-\x{1029c}\x{102a0}-\x{102d0}\x{10300}-\x{10323}\x{10330}-\x{1034a}\x{10350}-\x{10375}\x{10380}-\x{1039d}\x{1039f}-\x{103c3}\x{103c8}-\x{103d5}\x{10400}-\x{1049d}\x{104a0}-\x{104a9}\x{10500}-\x{10527}\x{10530}-\x{10563}\x{1056f}\x{10600}-\x{10736}\x{10740}-\x{10755}\x{10760}-\x{10767}\x{11000}\x{11002}-\x{11037}\x{11047}-\x{1104d}\x{11066}-\x{1106f}\x{11082}-\x{110b2}\x{110b7}\x{110b8}\x{110bb}-\x{110c1}\x{110d0}-\x{110e8}\x{110f0}-\x{110f9}\x{11103}-\x{11126}\x{1112c}\x{11136}-\x{11143}\x{11150}-\x{11172}\x{11174}-\x{11176}\x{11182}-\x{111b5}\x{111bf}-\x{111c9}\x{111cd}\x{111d0}-\x{111df}\x{111e1}-\x{111f4}\x{11200}-\x{11211}\x{11213}-\x{1122e}\x{11232}\x{11233}\x{11235}\x{11238}-\x{1123d}\x{11280}-\x{11286}\x{11288}\x{1128a}-\x{1128d}\x{1128f}-\x{1129d}\x{1129f}-\x{112a9}\x{112b0}-\x{112de}\x{112e0}-\x{112e2}\x{112f0}-\x{112f9}\x{11302}\x{11303}\x{11305}-\x{1130c}\x{1130f}\x{11310}\x{11313}-\x{11328}\x{1132a}-\x{11330}\x{11332}\x{11333}\x{11335}-\x{11339}\x{1133d}-\x{1133f}\x{11341}-\x{11344}\x{11347}\x{11348}\x{1134b}-\x{1134d}\x{11350}\x{11357}\x{1135d}-\x{11363}\x{11480}-\x{114b2}\x{114b9}\x{114bb}-\x{114be}\x{114c1}\x{114c4}-\x{114c7}\x{114d0}-\x{114d9}\x{11580}-\x{115b1}\x{115b8}-\x{115bb}\x{115be}\x{115c1}-\x{115db}\x{11600}-\x{11632}\x{1163b}\x{1163c}\x{1163e}\x{11641}-\x{11644}\x{11650}-\x{11659}\x{11680}-\x{116aa}\x{116ac}\x{116ae}\x{116af}\x{116b6}\x{116c0}-\x{116c9}\x{11700}-\x{11719}\x{11720}\x{11721}\x{11726}\x{11730}-\x{1173f}\x{118a0}-\x{118f2}\x{118ff}\x{11ac0}-\x{11af8}\x{12000}-\x{12399}\x{12400}-\x{1246e}\x{12470}-\x{12474}\x{12480}-\x{12543}\x{13000}-\x{1342e}\x{14400}-\x{14646}\x{16800}-\x{16a38}\x{16a40}-\x{16a5e}\x{16a60}-\x{16a69}\x{16a6e}\x{16a6f}\x{16ad0}-\x{16aed}\x{16af5}\x{16b00}-\x{16b2f}\x{16b37}-\x{16b45}\x{16b50}-\x{16b59}\x{16b5b}-\x{16b61}\x{16b63}-\x{16b77}\x{16b7d}-\x{16b8f}\x{16f00}-\x{16f44}\x{16f50}-\x{16f7e}\x{16f93}-\x{16f9f}\x{1b000}\x{1b001}\x{1bc00}-\x{1bc6a}\x{1bc70}-\x{1bc7c}\x{1bc80}-\x{1bc88}\x{1bc90}-\x{1bc99}\x{1bc9c}\x{1bc9f}\x{1d000}-\x{1d0f5}\x{1d100}-\x{1d126}\x{1d129}-\x{1d166}\x{1d16a}-\x{1d172}\x{1d183}\x{1d184}\x{1d18c}-\x{1d1a9}\x{1d1ae}-\x{1d1e8}\x{1d360}-\x{1d371}\x{1d400}-\x{1d454}\x{1d456}-\x{1d49c}\x{1d49e}\x{1d49f}\x{1d4a2}\x{1d4a5}\x{1d4a6}\x{1d4a9}-\x{1d4ac}\x{1d4ae}-\x{1d4b9}\x{1d4bb}\x{1d4bd}-\x{1d4c3}\x{1d4c5}-\x{1d505}\x{1d507}-\x{1d50a}\x{1d50d}-\x{1d514}\x{1d516}-\x{1d51c}\x{1d51e}-\x{1d539}\x{1d53b}-\x{1d53e}\x{1d540}-\x{1d544}\x{1d546}\x{1d54a}-\x{1d550}\x{1d552}-\x{1d6a5}\x{1d6a8}-\x{1d6da}\x{1d6dc}-\x{1d714}\x{1d716}-\x{1d74e}\x{1d750}-\x{1d788}\x{1d78a}-\x{1d7c2}\x{1d7c4}-\x{1d7cb}\x{1d800}-\x{1d9ff}\x{1da37}-\x{1da3a}\x{1da6d}-\x{1da74}\x{1da76}-\x{1da83}\x{1da85}-\x{1da8b}\x{1f110}-\x{1f12e}\x{1f130}-\x{1f169}\x{1f170}-\x{1f19a}\x{1f1e6}-\x{1f202}\x{1f210}-\x{1f23a}\x{1f240}-\x{1f248}\x{1f250}\x{1f251}\x{20000}-\x{2a6d6}\x{2a700}-\x{2b734}\x{2b740}-\x{2b81d}\x{2b820}-\x{2cea1}\x{2f800}-\x{2fa1d}\x{f0000}-\x{ffffd}\x{100000}-\x{10fffd}])|([\x{590}\x{5be}\x{5c0}\x{5c3}\x{5c6}\x{5c8}-\x{5ff}\x{7c0}-\x{7ea}\x{7f4}\x{7f5}\x{7fa}-\x{815}\x{81a}\x{824}\x{828}\x{82e}-\x{858}\x{85c}-\x{89f}\x{200f}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb4f}\x{10800}-\x{1091e}\x{10920}-\x{10a00}\x{10a04}\x{10a07}-\x{10a0b}\x{10a10}-\x{10a37}\x{10a3b}-\x{10a3e}\x{10a40}-\x{10ae4}\x{10ae7}-\x{10b38}\x{10b40}-\x{10e5f}\x{10e7f}-\x{10fff}\x{1e800}-\x{1e8cf}\x{1e8d7}-\x{1edff}\x{1ef00}-\x{1efff}\x{608}\x{60b}\x{60d}\x{61b}-\x{64a}\x{66d}-\x{66f}\x{671}-\x{6d5}\x{6e5}\x{6e6}\x{6ee}\x{6ef}\x{6fa}-\x{710}\x{712}-\x{72f}\x{74b}-\x{7a5}\x{7b1}-\x{7bf}\x{8a0}-\x{8e2}\x{fb50}-\x{fd3d}\x{fd40}-\x{fdcf}\x{fdf0}-\x{fdfc}\x{fdfe}\x{fdff}\x{fe70}-\x{fefe}\x{1ee00}-\x{1eeef}\x{1eef2}-\x{1eeff}]))/u';
+ private static $strongDirRegex = '/(?:([\x{41}-\x{5a}\x{61}-\x{7a}\x{aa}\x{b5}\x{ba}\x{c0}-\x{d6}\x{d8}-\x{f6}\x{f8}-\x{2b8}\x{2bb}-\x{2c1}\x{2d0}\x{2d1}\x{2e0}-\x{2e4}\x{2ee}\x{370}-\x{373}\x{376}\x{377}\x{37a}-\x{37d}\x{37f}\x{386}\x{388}-\x{38a}\x{38c}\x{38e}-\x{3a1}\x{3a3}-\x{3f5}\x{3f7}-\x{482}\x{48a}-\x{52f}\x{531}-\x{556}\x{559}-\x{55f}\x{561}-\x{587}\x{589}\x{903}-\x{939}\x{93b}\x{93d}-\x{940}\x{949}-\x{94c}\x{94e}-\x{950}\x{958}-\x{961}\x{964}-\x{980}\x{982}\x{983}\x{985}-\x{98c}\x{98f}\x{990}\x{993}-\x{9a8}\x{9aa}-\x{9b0}\x{9b2}\x{9b6}-\x{9b9}\x{9bd}-\x{9c0}\x{9c7}\x{9c8}\x{9cb}\x{9cc}\x{9ce}\x{9d7}\x{9dc}\x{9dd}\x{9df}-\x{9e1}\x{9e6}-\x{9f1}\x{9f4}-\x{9fa}\x{a03}\x{a05}-\x{a0a}\x{a0f}\x{a10}\x{a13}-\x{a28}\x{a2a}-\x{a30}\x{a32}\x{a33}\x{a35}\x{a36}\x{a38}\x{a39}\x{a3e}-\x{a40}\x{a59}-\x{a5c}\x{a5e}\x{a66}-\x{a6f}\x{a72}-\x{a74}\x{a83}\x{a85}-\x{a8d}\x{a8f}-\x{a91}\x{a93}-\x{aa8}\x{aaa}-\x{ab0}\x{ab2}\x{ab3}\x{ab5}-\x{ab9}\x{abd}-\x{ac0}\x{ac9}\x{acb}\x{acc}\x{ad0}\x{ae0}\x{ae1}\x{ae6}-\x{af0}\x{af9}\x{b02}\x{b03}\x{b05}-\x{b0c}\x{b0f}\x{b10}\x{b13}-\x{b28}\x{b2a}-\x{b30}\x{b32}\x{b33}\x{b35}-\x{b39}\x{b3d}\x{b3e}\x{b40}\x{b47}\x{b48}\x{b4b}\x{b4c}\x{b57}\x{b5c}\x{b5d}\x{b5f}-\x{b61}\x{b66}-\x{b77}\x{b83}\x{b85}-\x{b8a}\x{b8e}-\x{b90}\x{b92}-\x{b95}\x{b99}\x{b9a}\x{b9c}\x{b9e}\x{b9f}\x{ba3}\x{ba4}\x{ba8}-\x{baa}\x{bae}-\x{bb9}\x{bbe}\x{bbf}\x{bc1}\x{bc2}\x{bc6}-\x{bc8}\x{bca}-\x{bcc}\x{bd0}\x{bd7}\x{be6}-\x{bf2}\x{c01}-\x{c03}\x{c05}-\x{c0c}\x{c0e}-\x{c10}\x{c12}-\x{c28}\x{c2a}-\x{c39}\x{c3d}\x{c41}-\x{c44}\x{c58}-\x{c5a}\x{c60}\x{c61}\x{c66}-\x{c6f}\x{c7f}\x{c82}\x{c83}\x{c85}-\x{c8c}\x{c8e}-\x{c90}\x{c92}-\x{ca8}\x{caa}-\x{cb3}\x{cb5}-\x{cb9}\x{cbd}-\x{cc4}\x{cc6}-\x{cc8}\x{cca}\x{ccb}\x{cd5}\x{cd6}\x{cde}\x{ce0}\x{ce1}\x{ce6}-\x{cef}\x{cf1}\x{cf2}\x{d02}\x{d03}\x{d05}-\x{d0c}\x{d0e}-\x{d10}\x{d12}-\x{d3a}\x{d3d}-\x{d40}\x{d46}-\x{d48}\x{d4a}-\x{d4c}\x{d4e}\x{d57}\x{d5f}-\x{d61}\x{d66}-\x{d75}\x{d79}-\x{d7f}\x{d82}\x{d83}\x{d85}-\x{d96}\x{d9a}-\x{db1}\x{db3}-\x{dbb}\x{dbd}\x{dc0}-\x{dc6}\x{dcf}-\x{dd1}\x{dd8}-\x{ddf}\x{de6}-\x{def}\x{df2}-\x{df4}\x{e01}-\x{e30}\x{e32}\x{e33}\x{e40}-\x{e46}\x{e4f}-\x{e5b}\x{e81}\x{e82}\x{e84}\x{e87}\x{e88}\x{e8a}\x{e8d}\x{e94}-\x{e97}\x{e99}-\x{e9f}\x{ea1}-\x{ea3}\x{ea5}\x{ea7}\x{eaa}\x{eab}\x{ead}-\x{eb0}\x{eb2}\x{eb3}\x{ebd}\x{ec0}-\x{ec4}\x{ec6}\x{ed0}-\x{ed9}\x{edc}-\x{edf}\x{f00}-\x{f17}\x{f1a}-\x{f34}\x{f36}\x{f38}\x{f3e}-\x{f47}\x{f49}-\x{f6c}\x{f7f}\x{f85}\x{f88}-\x{f8c}\x{fbe}-\x{fc5}\x{fc7}-\x{fcc}\x{fce}-\x{fda}\x{1000}-\x{102c}\x{1031}\x{1038}\x{103b}\x{103c}\x{103f}-\x{1057}\x{105a}-\x{105d}\x{1061}-\x{1070}\x{1075}-\x{1081}\x{1083}\x{1084}\x{1087}-\x{108c}\x{108e}-\x{109c}\x{109e}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1360}-\x{137c}\x{1380}-\x{138f}\x{13a0}-\x{13f5}\x{13f8}-\x{13fd}\x{1401}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16f8}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1735}\x{1736}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17b6}\x{17be}-\x{17c5}\x{17c7}\x{17c8}\x{17d4}-\x{17da}\x{17dc}\x{17e0}-\x{17e9}\x{1810}-\x{1819}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191e}\x{1923}-\x{1926}\x{1929}-\x{192b}\x{1930}\x{1931}\x{1933}-\x{1938}\x{1946}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19b0}-\x{19c9}\x{19d0}-\x{19da}\x{1a00}-\x{1a16}\x{1a19}\x{1a1a}\x{1a1e}-\x{1a55}\x{1a57}\x{1a61}\x{1a63}\x{1a64}\x{1a6d}-\x{1a72}\x{1a80}-\x{1a89}\x{1a90}-\x{1a99}\x{1aa0}-\x{1aad}\x{1b04}-\x{1b33}\x{1b35}\x{1b3b}\x{1b3d}-\x{1b41}\x{1b43}-\x{1b4b}\x{1b50}-\x{1b6a}\x{1b74}-\x{1b7c}\x{1b82}-\x{1ba1}\x{1ba6}\x{1ba7}\x{1baa}\x{1bae}-\x{1be5}\x{1be7}\x{1bea}-\x{1bec}\x{1bee}\x{1bf2}\x{1bf3}\x{1bfc}-\x{1c2b}\x{1c34}\x{1c35}\x{1c3b}-\x{1c49}\x{1c4d}-\x{1c7f}\x{1cc0}-\x{1cc7}\x{1cd3}\x{1ce1}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf3}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{200e}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{214f}\x{2160}-\x{2188}\x{2336}-\x{237a}\x{2395}\x{249c}-\x{24e9}\x{26ac}\x{2800}-\x{28ff}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d70}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{302e}\x{302f}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{3190}-\x{31ba}\x{31f0}-\x{321c}\x{3220}-\x{324f}\x{3260}-\x{327b}\x{327f}-\x{32b0}\x{32c0}-\x{32cb}\x{32d0}-\x{32fe}\x{3300}-\x{3376}\x{337b}-\x{33dd}\x{33e0}-\x{33fe}\x{3400}-\x{4db5}\x{4e00}-\x{9fd5}\x{a000}-\x{a48c}\x{a4d0}-\x{a60c}\x{a610}-\x{a62b}\x{a640}-\x{a66e}\x{a680}-\x{a69d}\x{a6a0}-\x{a6ef}\x{a6f2}-\x{a6f7}\x{a722}-\x{a787}\x{a789}-\x{a7ad}\x{a7b0}-\x{a7b7}\x{a7f7}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a824}\x{a827}\x{a830}-\x{a837}\x{a840}-\x{a873}\x{a880}-\x{a8c3}\x{a8ce}-\x{a8d9}\x{a8f2}-\x{a8fd}\x{a900}-\x{a925}\x{a92e}-\x{a946}\x{a952}\x{a953}\x{a95f}-\x{a97c}\x{a983}-\x{a9b2}\x{a9b4}\x{a9b5}\x{a9ba}\x{a9bb}\x{a9bd}-\x{a9cd}\x{a9cf}-\x{a9d9}\x{a9de}-\x{a9e4}\x{a9e6}-\x{a9fe}\x{aa00}-\x{aa28}\x{aa2f}\x{aa30}\x{aa33}\x{aa34}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa4d}\x{aa50}-\x{aa59}\x{aa5c}-\x{aa7b}\x{aa7d}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aaeb}\x{aaee}-\x{aaf5}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{ab30}-\x{ab65}\x{ab70}-\x{abe4}\x{abe6}\x{abe7}\x{abe9}-\x{abec}\x{abf0}-\x{abf9}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{e000}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}\x{10000}-\x{1000b}\x{1000d}-\x{10026}\x{10028}-\x{1003a}\x{1003c}\x{1003d}\x{1003f}-\x{1004d}\x{10050}-\x{1005d}\x{10080}-\x{100fa}\x{10100}\x{10102}\x{10107}-\x{10133}\x{10137}-\x{1013f}\x{101d0}-\x{101fc}\x{10280}-\x{1029c}\x{102a0}-\x{102d0}\x{10300}-\x{10323}\x{10330}-\x{1034a}\x{10350}-\x{10375}\x{10380}-\x{1039d}\x{1039f}-\x{103c3}\x{103c8}-\x{103d5}\x{10400}-\x{1049d}\x{104a0}-\x{104a9}\x{10500}-\x{10527}\x{10530}-\x{10563}\x{1056f}\x{10600}-\x{10736}\x{10740}-\x{10755}\x{10760}-\x{10767}\x{11000}\x{11002}-\x{11037}\x{11047}-\x{1104d}\x{11066}-\x{1106f}\x{11082}-\x{110b2}\x{110b7}\x{110b8}\x{110bb}-\x{110c1}\x{110d0}-\x{110e8}\x{110f0}-\x{110f9}\x{11103}-\x{11126}\x{1112c}\x{11136}-\x{11143}\x{11150}-\x{11172}\x{11174}-\x{11176}\x{11182}-\x{111b5}\x{111bf}-\x{111c9}\x{111cd}\x{111d0}-\x{111df}\x{111e1}-\x{111f4}\x{11200}-\x{11211}\x{11213}-\x{1122e}\x{11232}\x{11233}\x{11235}\x{11238}-\x{1123d}\x{11280}-\x{11286}\x{11288}\x{1128a}-\x{1128d}\x{1128f}-\x{1129d}\x{1129f}-\x{112a9}\x{112b0}-\x{112de}\x{112e0}-\x{112e2}\x{112f0}-\x{112f9}\x{11302}\x{11303}\x{11305}-\x{1130c}\x{1130f}\x{11310}\x{11313}-\x{11328}\x{1132a}-\x{11330}\x{11332}\x{11333}\x{11335}-\x{11339}\x{1133d}-\x{1133f}\x{11341}-\x{11344}\x{11347}\x{11348}\x{1134b}-\x{1134d}\x{11350}\x{11357}\x{1135d}-\x{11363}\x{11480}-\x{114b2}\x{114b9}\x{114bb}-\x{114be}\x{114c1}\x{114c4}-\x{114c7}\x{114d0}-\x{114d9}\x{11580}-\x{115b1}\x{115b8}-\x{115bb}\x{115be}\x{115c1}-\x{115db}\x{11600}-\x{11632}\x{1163b}\x{1163c}\x{1163e}\x{11641}-\x{11644}\x{11650}-\x{11659}\x{11680}-\x{116aa}\x{116ac}\x{116ae}\x{116af}\x{116b6}\x{116c0}-\x{116c9}\x{11700}-\x{11719}\x{11720}\x{11721}\x{11726}\x{11730}-\x{1173f}\x{118a0}-\x{118f2}\x{118ff}\x{11ac0}-\x{11af8}\x{12000}-\x{12399}\x{12400}-\x{1246e}\x{12470}-\x{12474}\x{12480}-\x{12543}\x{13000}-\x{1342e}\x{14400}-\x{14646}\x{16800}-\x{16a38}\x{16a40}-\x{16a5e}\x{16a60}-\x{16a69}\x{16a6e}\x{16a6f}\x{16ad0}-\x{16aed}\x{16af5}\x{16b00}-\x{16b2f}\x{16b37}-\x{16b45}\x{16b50}-\x{16b59}\x{16b5b}-\x{16b61}\x{16b63}-\x{16b77}\x{16b7d}-\x{16b8f}\x{16f00}-\x{16f44}\x{16f50}-\x{16f7e}\x{16f93}-\x{16f9f}\x{1b000}\x{1b001}\x{1bc00}-\x{1bc6a}\x{1bc70}-\x{1bc7c}\x{1bc80}-\x{1bc88}\x{1bc90}-\x{1bc99}\x{1bc9c}\x{1bc9f}\x{1d000}-\x{1d0f5}\x{1d100}-\x{1d126}\x{1d129}-\x{1d166}\x{1d16a}-\x{1d172}\x{1d183}\x{1d184}\x{1d18c}-\x{1d1a9}\x{1d1ae}-\x{1d1e8}\x{1d360}-\x{1d371}\x{1d400}-\x{1d454}\x{1d456}-\x{1d49c}\x{1d49e}\x{1d49f}\x{1d4a2}\x{1d4a5}\x{1d4a6}\x{1d4a9}-\x{1d4ac}\x{1d4ae}-\x{1d4b9}\x{1d4bb}\x{1d4bd}-\x{1d4c3}\x{1d4c5}-\x{1d505}\x{1d507}-\x{1d50a}\x{1d50d}-\x{1d514}\x{1d516}-\x{1d51c}\x{1d51e}-\x{1d539}\x{1d53b}-\x{1d53e}\x{1d540}-\x{1d544}\x{1d546}\x{1d54a}-\x{1d550}\x{1d552}-\x{1d6a5}\x{1d6a8}-\x{1d6da}\x{1d6dc}-\x{1d714}\x{1d716}-\x{1d74e}\x{1d750}-\x{1d788}\x{1d78a}-\x{1d7c2}\x{1d7c4}-\x{1d7cb}\x{1d800}-\x{1d9ff}\x{1da37}-\x{1da3a}\x{1da6d}-\x{1da74}\x{1da76}-\x{1da83}\x{1da85}-\x{1da8b}\x{1f110}-\x{1f12e}\x{1f130}-\x{1f169}\x{1f170}-\x{1f19a}\x{1f1e6}-\x{1f202}\x{1f210}-\x{1f23a}\x{1f240}-\x{1f248}\x{1f250}\x{1f251}\x{20000}-\x{2a6d6}\x{2a700}-\x{2b734}\x{2b740}-\x{2b81d}\x{2b820}-\x{2cea1}\x{2f800}-\x{2fa1d}\x{f0000}-\x{ffffd}\x{100000}-\x{10fffd}])|([\x{590}\x{5be}\x{5c0}\x{5c3}\x{5c6}\x{5c8}-\x{5ff}\x{7c0}-\x{7ea}\x{7f4}\x{7f5}\x{7fa}-\x{815}\x{81a}\x{824}\x{828}\x{82e}-\x{858}\x{85c}-\x{89f}\x{200f}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb4f}\x{10800}-\x{1091e}\x{10920}-\x{10a00}\x{10a04}\x{10a07}-\x{10a0b}\x{10a10}-\x{10a37}\x{10a3b}-\x{10a3e}\x{10a40}-\x{10ae4}\x{10ae7}-\x{10b38}\x{10b40}-\x{10e5f}\x{10e7f}-\x{10fff}\x{1e800}-\x{1e8cf}\x{1e8d7}-\x{1edff}\x{1ef00}-\x{1efff}\x{608}\x{60b}\x{60d}\x{61b}-\x{64a}\x{66d}-\x{66f}\x{671}-\x{6d5}\x{6e5}\x{6e6}\x{6ee}\x{6ef}\x{6fa}-\x{710}\x{712}-\x{72f}\x{74b}-\x{7a5}\x{7b1}-\x{7bf}\x{8a0}-\x{8e2}\x{fb50}-\x{fd3d}\x{fd40}-\x{fdcf}\x{fdf0}-\x{fdfc}\x{fdfe}\x{fdff}\x{fe70}-\x{fefe}\x{1ee00}-\x{1eeef}\x{1eef2}-\x{1eeff}]))/u';
// @codeCoverageIgnoreEnd
/**
* @since 1.20
* @var array
*/
- static public $languagesWithVariants = [
+ public static $languagesWithVariants = [
'en',
'crh',
'gan',
private function addMappings( $mapArray, &$A2B, &$B2A, $exactCase = false,
$prePat = '', $postPat = '' ) {
foreach ( $mapArray as $WordA => $WordB ) {
- if ( ! $exactCase ) {
+ if ( !$exactCase ) {
$ucA = $this->myUc( $WordA );
$ucWordA = $this->myUcWord( $WordA );
$ucB = $this->myUc( $WordB );
}
# if there are regexes, only map toward backregs
- if ( ! preg_match( '/\$[1-9]/', $WordA ) ) {
+ if ( !preg_match( '/\$[1-9]/', $WordA ) ) {
$A2B[ $prePat . $WordA . $postPat ] = $WordB;
- if ( ! $exactCase ) {
+ if ( !$exactCase ) {
$A2B[ $prePat . $ucWordA . $postPat ] = $ucWordB;
$A2B[ $prePat . $ucA . $postPat ] = $ucB;
}
}
- if ( ! preg_match( '/\$[1-9]/', $WordB ) ) {
+ if ( !preg_match( '/\$[1-9]/', $WordB ) ) {
$B2A[ $prePat . $WordB . $postPat ] = $WordA;
- if ( ! $exactCase ) {
+ if ( !$exactCase ) {
$B2A[ $prePat . $ucWordB . $postPat ] = $ucWordA;
$B2A[ $prePat . $ucB . $postPat ] = $ucA;
}
"badarticleerror": "Þēos dǣd ne cann bēon gefremed on þissum tramete.",
"cannotdelete": "Se tramet oþðe ymele \"$1\" ne meahte beon ahwiten. Meahtlice hæfþ adihtere ær hine astricon.",
"cannotdelete-title": "Ne cann forlēosan þone tramet \"$1\"",
+ "delete-hook-aborted": "Ahwitung aswamode of hacan. He geaf nan racu.",
"badtitle": "Nā genge titul",
"title-invalid-too-long": "Se trametnama þone þū wilt is to lang. He sceal bēon ne langor þon $1 {{PLURAL:$1|byte|bytan}} in UTF-8 rūncræfte.",
"title-invalid-leading-colon": "Se trametnama þone þū wilt beclypeþ unregolfæsten twafealden prican æt his orde.",
"myprivateinfoprotected": "Þū nafast lēafe tō adihtenne þīne āgnan cȳþþu.",
"mypreferencesprotected": "Þū nafast lēafe tō adihtenne þīna foreberunga.",
"ns-specialprotected": "Syndrige trametas ne cunnon wesan adihted.",
+ "invalidtitle": "Ungenga titul",
+ "invalidtitle-knownnamespace": "Ungenga titul mid namafæce \"S=$2\" and gewrite \"$3\"",
+ "invalidtitle-unknownnamespace": "Ungenga titul mid uncuþe namafæce rim $1 and gewrite \"$2\"",
"exception-nologin": "Ne inloggod",
"virus-badscanner": "Yfel gesetedness: Uncūþ wyrmsēcend: <em>$1</em>",
"virus-unknownscanner": "uncūþ andgund:",
"ipb_expiry_old": "Час сканчэньня ўжо мінуў.",
"ipb_expiry_temp": "Блякаваньні са схаваньнем імя ўдзельніка павінны быць бестэрміновымі.",
"ipb_hide_invalid": "Немагчыма схаваць гэты рахунак; зь яго зроблена больш чым {{PLURAL:$1|$1 рэдагаваньне|$1 рэдагаваньні|$1 рэдагаваньняў}}.",
+ "ipb_hide_partial": "Блякаваньні схаваных імёнаў удзельнікаў мусяць пашырацца на ўвесь сайт.",
"ipb_already_blocked": "«$1» ужо заблякаваны",
"ipb-needreblock": "$1 ужо заблякаваны. Вы жадаеце зьмяніць парамэтры?",
"ipb-otherblocks-header": "{{PLURAL:$1|1=Іншае блякаваньне|Іншыя блякаваньні}}",
"ip_range_toolarge": "Забранено е блокиране на диапазони от IP адреси по-големи от /$1.",
"ip_range_exceeded": "IP диапазонът превишава максималния диапазон. Позволен диапазон: /$1.",
"proxyblocker": "Блокировач на проксита",
- "proxyblockreason": "IP-адÑ\80еÑ\81Ñ\8aÑ\82 Ð\92и беÑ\88е блокиÑ\80ан, Ñ\82Ñ\8aй каÑ\82о е анонимно доÑ\81Ñ\82Ñ\8aпен междинен Ñ\81Ñ\8aÑ\80вÑ\8aÑ\80. Свържете се с доставчика си на Интернет и го информирайте за този сериозен проблем в сигурността.",
+ "proxyblockreason": "IP-адÑ\80еÑ\81Ñ\8aÑ\82 Ð\92и беÑ\88е блокиÑ\80ан, Ñ\82Ñ\8aй каÑ\82о пÑ\80едÑ\81Ñ\82авлÑ\8fва анонимно доÑ\81Ñ\82Ñ\8aпен междинен Ñ\81Ñ\8aÑ\80вÑ\8aÑ\80.\nСвържете се с доставчика си на Интернет и го информирайте за този сериозен проблем в сигурността.",
"sorbs": "DNSBL",
"sorbsreason": "IP-адресът Ви е записан като анонимно достъпен междинен сървър в DNSBL на {{SITENAME}}.",
"sorbs_create_account_reason": "IP-адресът Ви е записан като анонимно достъпен междинен сървър в DNSBL на {{SITENAME}}.\nНе може да създадете сметка.",
"createacct-email-ph": "تیرنشۊن ٱنجوماناماْ تۊناْ بزنین.",
"createacct-another-email-ph": "تیرنشۊن ٱنجوماناماْ تۊناْ بزنین.",
"createaccountmail": "یٱ رازیناْ گوڌٱشتن موڤٱقٱتی ناْ ڤاْنین ڤا کار و سی یٱ تیرنشوݩ ٱنجوماناماْ تیار ڤابیڌاْ باْسیس کونین.",
+ "createaccountmail-help": "ایسا ترین یٱ هساو کاریاری سی یکی دیٱ راسد کونین بی یو کاْ رازیناْ گوڌٱشتنساْ ڤٱنین ڤا ڤیر.",
"createacct-realname": "نوم راستٱکی(اٛژباری نی)",
"createacct-reason": "دلیل",
"createacct-reason-ph": "سی چ ایسا دارین یٱ هساو کاریاری دیٱر راسد اْکونین",
"loginerror": "خٱتا سی ڤامیٛن ٱڤوڌن",
"createacct-error": "خٱتا راس کردن هساو کاریاری",
"createaccounterror": "نیبۊ هساو کاریاری راسد کونین:$1",
+ "nocookiesnew": "هساو کاریاری راست ڤابی، ڤٱلی ایسا هاْنی نٱڤوڌیناْ ڤامیٛن.{{SITENAME}} کۊکیا ناْ سی ڤامیٛن ٱڤوڌن ناْ کاریارٱل اْڤٱناْ ڤا کار.\nکۊکیا ایسا ناکونشتگٱر ڤابیڌناْ.\nلوتف کونین کونشتگٱرسون کونین، اوسو ڤا یٱ نوم کاریاری و رازیناْ گوڌٱشتن دیٱ بیائین ڤامیٛن.",
"nocookiesfornew": "هساو کاریاری راسد نٱڤابی، سی یو ناْ کاْ ایما نٱتریم سرچشماْساْ پوشت راست کاری کونیم.\nخاتر جٱم بۊین کاْ کۊکیٱل کونشتکار ڤابیناْ، ای بٱلگاْ ناْ ز نۉ سوڤار کونین و یٱ کاْرٱت دیٱ تلاش کونین.",
"loginsuccesstitle": "ایسا ٱڤوڌین ڤامیٛن",
"loginsuccess": "'''ایسا ٱڤوڌین ڤامیٛن {{SITENAME}} چی \"$1\".'''",
"ipb-sitewide": "A tot el lloc web",
"ipb-partial": "Parcial",
"ipb-pages-label": "Pàgines",
+ "ipb-namespaces-label": "Espais de noms",
"badipaddress": "L'adreça IP no té el format correcte.",
"blockipsuccesssub": "S'ha blocat amb èxit",
"blockipsuccesstext": "S'ha {{GENDER:$1|blocat}} [[Special:Contributions/$1|$1]].<br />\nVegeu la [[Special:BlockList|llista de blocatges]] per revisar-los.",
"blocklist-nousertalk": "no podeu modificar la pàgina de discussió pròpia",
"blocklist-editing": "edició",
"blocklist-editing-sitewide": "edició (a tot el lloc)",
+ "blocklist-editing-page": "pàgines",
+ "blocklist-editing-ns": "espais de noms",
"ipblocklist-empty": "La llista de blocatges està buida.",
"ipblocklist-no-results": "L'adreça IP o nom d'usuari sol·licitat no està blocat.",
"blocklink": "bloca",
"recentchangescount": "Ӏадйитаран кепаца гойтуш долу нисдарийн дукхалла",
"prefs-help-recentchangescount": "Гойту керла нисдарш, агӀонийн истори, тептарш.",
"prefs-help-watchlist-token2": "Иза хьан тергаме могӀан къайла догӀа ду.\nМуьлха и хуучунна йиш ю хьан тергаме могӀам беша, цундела ма хаийта иза кхечаьрга. [[Special:ResetTokens|ТӀетаӀа йе кхуза и хьайга кхосса лууш делахь]].",
+ "prefs-help-tokenmanagement": "Хьа йиш ю хьажина хьайн дӀаяздаран доӀа кхосса. Оцо аьтту бо хьа тергаме могӀаман веб-каналан тӀекхача. И доӀа хуучун йиш ю хьа тергаме могӀаме хьажа, цундела ма хаийта иза кхечаьрга.",
"savedprefs": "Хьан гӀирс Ӏалашбина.",
"savedrights": "{{GENDER:$1|$1}} декъашхочун бакъонаш Ӏалашйина.",
"timezonelegend": "Сахьтан аса:",
"ipb_expiry_old": "Der Zeitpunkt des Ablaufs liegt in der Vergangenheit.",
"ipb_expiry_temp": "Benutzernamens-Sperren mit der Verstecken-Option müssen permanent sein.",
"ipb_hide_invalid": "Dieses Konto kann nicht unterdrückt werden, da es mehr als {{PLURAL:$1|eine Bearbeitung|$1 Bearbeitungen}} aufweist.",
+ "ipb_hide_partial": "Versteckte Benutzernamenssperren müssen websiteweite Sperren sein.",
"ipb_already_blocked": "„$1“ ist bereits gesperrt",
"ipb-needreblock": "„$1“ ist bereits gesperrt. Möchtest du die Sperrparameter ändern?",
"ipb-otherblocks-header": "Andere {{PLURAL:$1|Sperre|Sperren}}",
"searchprofile-everything-tooltip": "Tedeesteyan hemine cı geyre (pelanê werênayışi zi tey)",
"searchprofile-advanced-tooltip": "Cayê namanê xısusiyan de cı geyre",
"search-result-size": "$1 ({{PLURAL:$2|1 çeku|$2 çekuy}})",
- "search-result-category-size": "{{PLURAL:$1|1 eza|$1 ezayan}} ({{PLURAL:$2|1 kategoriyê bini|$2 kategirayanê binan}}, {{PLURAL:$3|1 dosya|$3 dosyayan}})",
+ "search-result-category-size": "{{PLURAL:$1|1 eza|$1 ezayi}} ({{PLURAL:$2|1 kategoriya bınêne|$2 kategoriyê bınêni}}, {{PLURAL:$3|1 dosya|$3 dosyeyi}})",
"search-redirect": "($1 ra kırışiyaya)",
"search-section": "(qısmê $1)",
"search-category": "(kategoriye $1)",
"pageswithprop-prophidden-binary": "valor de la propiedad binaria oculta ($1)",
"doubleredirects": "Redirecciones dobles",
"doubleredirectstext": "Esta página contiene una lista de páginas que redirigen a otras páginas de redirección.\nCada fila contiene enlaces a la segunda y tercera redirección, así como la primera línea de la segunda redirección, en la que usualmente se encontrará el artículo «real» al que la primera redirección debería apuntar.\nLas entradas <del>tachadas</del> han sido resueltas.",
- "double-redirect-fixed-move": "[[$1]] se ha trasladado.\nSe actualizó automáticamente y ahora redirecciona a [[$2]].",
+ "double-redirect-fixed-move": "[[$1]] se ha trasladado.\nSe actualizó automáticamente y ahora redirige a [[$2]].",
"double-redirect-fixed-maintenance": "Corrección automática de redirección doble de [[$1]] a [[$2]] mediante una tarea de mantenimiento",
"double-redirect-fixer": "Corrector de redirecciones",
"brokenredirects": "Redirecciones incorrectas",
"modifiedarticleprotection": "\"[[$1]]\"(r)en babes maila aldatu da",
"unprotectedarticle": "\"[[$1]]\"-(r)i babesa kendu zaio",
"movedarticleprotection": "babes hobespenak «[[$2]]» orritik «[[$1]]» orrira aldatu dira",
- "protectedarticle-comment": "{{GENDER:$2|Babestua}} \"[[$1]]\"",
+ "protectedarticle-comment": "administratzaileak «[[$1]]» {{GENDER:$2|babestu du}}",
"modifiedarticleprotection-comment": "{{GENDER:$2|Babespen maila aldatu du}} \"[[$1]]\"(r)entzako",
"unprotectedarticle-comment": "{{GENDER:$2|administratzaileak}} babesa kendu dio «[[$1]]» orriari",
"protect-title": "«$1» babesten",
"ipb-blocklist": "Blokeaketak ikusi",
"ipb-blocklist-contribs": "{{GENDER:$1|$1(r)en}} ekarpenak",
"ipb-blocklist-duration-left": "gainerako $1",
+ "block-actions": "Blokeatuko diren ekintzak:",
"block-expiry": "Iraungipena",
"unblockip": "Erabiltzailea desblokeatu",
"unblockiptext": "Erabili beheko formularioa lehenago blokeatutako IP helbide edo erabiltzaile baten idazketa baimenak leheneratzeko.",
"createaccountblock": "kontua sortzea blokeatuta",
"emailblock": "e-posta blokeatuta",
"blocklist-nousertalk": "zure buruaren eztabaida orrialdea ezin duzu aldatu",
+ "blocklist-editing": "aldatzen",
+ "blocklist-editing-sitewide": "editatzea (gune osoan)",
"ipblocklist-empty": "Blokeaketa zerrenda hutsik dago.",
"ipblocklist-no-results": "Zehaztutako IP helbide edo erabiltzaile izena ez dago blokeatuta.",
"blocklink": "blokeatu",
"ipb_expiry_old": "L’heure d’expiration est passée.",
"ipb_expiry_temp": "Les blocages de noms d'utilisateurs cachés doivent être permanents.",
"ipb_hide_invalid": "Impossible de supprimer ce compte ; il semble avoir plus {{PLURAL:$1|d’une modification|de $1 modifications}}.",
+ "ipb_hide_partial": "Les blocages de nom d’utilisateur masqués doivent être des blocages pour le site.",
"ipb_already_blocked": "« $1 » est déjà bloqué",
"ipb-needreblock": "$1 est déjà bloqué. Voulez-vous modifier les paramètres ?",
"ipb-otherblocks-header": "{{PLURAL:$1|Autre blocage|Autres blocages}}",
"specialpage": "विशेश पान",
"personaltools": "खाजगी साधनां",
"talk": "भासाभास",
- "views": "दà¥\83शà¥\8dयाà¤\82",
+ "views": "दà¥\83षà¥\8dà¤\9fà¥\80",
"toolbox": "साधनां",
"imagepage": "फायलीचें पान पळेयात",
"mediawikipage": "संदेशाचें पान पळयात",
"tog-enotifwatchlistpages": "Mhojea sadurvollerintlem pan vo fayl bodol'li zalear mhaka email dhadd",
"tog-shownumberswatching": "Nodor dovorpi vaporpeanche sonkhya dakhoi",
"tog-oldsig": "Tujea sod'dheachi soy:",
- "tog-uselivepreview": "Boroitastana zolok dahkoi",
+ "tog-uselivepreview": "Pan porot ugdinastana zolok dahkoi",
"tog-watchlisthideown": "Sadurvollerint mhoje bodol lipoi",
"tog-watchlisthidebots": "Sadurvollerint robotani kel'le bodol lipoi",
"tog-watchlisthideminor": "Sadurvollerint dhaktem bodol lipoi",
"specialpage": "Vixex pan",
"personaltools": "Khasgi avtam",
"talk": "Bhasabhas",
- "views": "Drishya",
+ "views": "Dixtti",
"toolbox": "Avtam",
"imagepage": "Faylichem pan poloi",
"mediawikipage": "Sondexachem pan polloi",
"watchthis": "Hea panar dixtt dovor",
"savearticle": "Pan samball",
"savechanges": "Bodol samball",
+ "publishpage": "Pan uzvaddai",
"publishchanges": "Bodol uzvaddai",
+ "publishpage-start": "Pan uzvaddai...",
"publishchanges-start": "Bodol uzvaddai...",
"preview": "Zholok",
"showpreview": "Zholok dakhoi",
"tooltip-ca-nstab-category": "Vorgachem pan polloi",
"tooltip-minoredit": "Haka ek kirkoll sudharop mhunn khunnay",
"tooltip-save": "Tuje bodol sambhall",
+ "tooltip-publish": "Tujeo bodol uzvaddai",
"tooltip-preview": "Bodolanchi zholok polloi. Upkar korun samballche adim hachem upeog kor!",
"tooltip-diff": "Tumi hea mozkurant kelelo bodol dakhoiat",
"tooltip-compareselectedversions": "Hea panacheo don nivoddleleo uzollneo modem forok polloi",
"ipb_expiry_old": "זמן הפקיעה כבר עבר.",
"ipb_expiry_temp": "חסימות הכוללות הסתרת שם משתמש חייבות להיות לזמן בלתי מוגבל.",
"ipb_hide_invalid": "לא ניתן להעלים את החשבון הזה; {{PLURAL:$1|בוצעה ממנו יותר מעריכה אחת|בוצעו ממנו יותר מ־$1 עריכות}}.",
+ "ipb_hide_partial": "חסימות הכוללות הסתרת שם משתמש חייבות לחול על כל האתר.",
"ipb_already_blocked": "המשתמש \"$1\" כבר נחסם.",
"ipb-needreblock": "$1 כבר {{GENDER:$1|חסום|חסומה}}. האם ברצונך לשנות את הגדרות החסימה?",
"ipb-otherblocks-header": "{{PLURAL:$1|חסימה אחרת|חסימות אחרות}}",
"september-date": "Ọnwaìtoolu $1",
"october-date": "Ọnwaìri $1",
"november-date": "Ọnwaìrinàotù $1",
- "december-date": "Ọnwaìrinààbụọ",
+ "december-date": "Ọnwa Iri na abụọ $1",
"pagecategories": "{{PLURAL:$1|Ụdàkọ}}",
"category_header": "Ihu nà ime ụdàkọ \"$1\"",
"subcategories": "Ụdàkọòkpurù",
"newwindow": "(o na mepo na onyonyo ohúrù)",
"cancel": "Hapụ̀",
"moredotdotdot": "Ozókwá...",
+ "morenotlisted": "Ọdika ndepụta a ezugioke.",
"mypage": "Ihü",
"mytalk": "Nkàta",
"anontalk": "Nkàta",
"returnto": "Ganata na $1.",
"tagline": "Oshị {{SITENAME}}",
"help": "Inyeáká",
+ "help-mediawiki": "Enyemaka gbasara MidiyaWiki",
"search": "Tùwe",
"searchbutton": "Tùwe",
"go": "Gá",
"searcharticle": "Gá",
"history": "Ịta ihüá",
"history_short": "Ịta",
+ "history_small": "akụkọ ihe mere eme",
"updatedmarker": "ihe gáráníru ké mgbe m byàrà nga mbu",
"printableversion": "Ùdì ǹke mbipụ̀",
"permalink": "Jikodo ekechịrị",
"category-empty": "ای دٱسٱ د راستٱکی د ڤٱرگرتٱ هیچ بٱلگٱ یا ڤارسگٱری نی",
"hidden-categories": "{{PLURAL:$1|دٱسٱ قایم بیٱ|دٱسٱیا قایم بیٱ}}",
"hidden-category-category": "دأسە یا قام بییە",
- "category-subcat-count": "{{PLURAL:$2|ای دٱسٱ فٱقٱت زیر دٱسٱ یا دئماگر هان دش.ای دٱسٱ {{PLURAL:$1|زیردٱسٱ|$1 زیردٱسٱیا}} ٱ , ڤ دٱر د $2 کول.}}",
+ "category-subcat-count": "{{PLURAL:$2|اؽ دٱسٱ فقٱت زؽر دٱسٱیا دماگر هان دش.اؽ دٱسٱ {{PLURAL:$1|زؽردٱسٱ|$1 زؽردٱسٱیا}} ٱ , ڤ دٱر د $2 کولٛ.}}",
"category-subcat-count-limited": "ئی دأسە ها د {{PLURAL:$1|زیردأسە|$1 زیردأسە یا}} یی کئ ها ڤئ دومئشوٙ",
- "category-article-count": "{{PLURAL:$2|ای دٱسٱ د ڤٱرگرتٱ بٱلگٱ نئهاییٱ.| {{PLURAL:$1| بٱلگٱ هی|$1 بٱلگٱیا هین}} د ای دٱسٱ، ڤ دٱر د $2 کول.}}",
+ "category-article-count": "{{PLURAL:$2|اؽ دٱسٱ د ڤٱرگرتٱ بٱلگٱ نهاییٱ.| {{PLURAL:$1| بٱلگٱ هؽ|$1 بٱلگٱیا هؽسن}} د اؽ دٱسٱ، ڤ دٱر د $2 کولٛ.}}",
"category-article-count-limited": "نئها {{PLURAL:$1|بألگە هی|$1بألگە یا هئن}} د دأسە ئیسئنی.",
"category-file-count": "{{PLURAL:$2|ای دٱسٱ فٱقٱت د ڤٱرگرتٱ جانیا نئهاییٱ.| نئهایی {{PLURAL:$1|جانیا هی|$1 جانیایا هین}} د ای دٱسٱ، ڤ دٱر د کول $2 .}}",
"category-file-count-limited": " {{PLURAL:$1|[جانیا هی|1$جانیایا هین}} نئهایی هان د دأسە ئیسئنی.",
"searchbutton": "پاٛ جۊری",
"go": "رو",
"searcharticle": "رۉ",
- "history": "ڤیرگار بألگە",
+ "history": "ڤیرگار بٱلگٱ",
"history_short": "ڤیرگار",
"updatedmarker": "د آخئری دییئن مئنە ڤئ هنگوم کو",
"printableversion": "نۏسخٱ پلا بینی",
"site-rss-feed": "هأڤال حوٙن RSS سی $1",
"site-atom-feed": "هوڤال هۊ Atom سی $1",
"page-rss-feed": "هأڤال حوٙن RSS سی «$1»",
- "page-atom-feed": "هأڤال حوٙن Atom سی $1",
+ "page-atom-feed": "هٱڤال هۊن Atom سی $1",
"feed-atom": "اتم",
"feed-rss": "آر اس اس",
"red-link-title": "$1(بٱلگٱ نؽسش)",
"subject-preview": "داسوٙن/پیش سئیل سأرخأط:",
"previewerrortext": "یئ گئل خأطا د گاتی کئ شوما میهاستیت یئ گئل پیش سئل د آلئشتیاتوٙ داشتوٙین پیش ئوٙماە.",
"blockedtitle": "کاریار نئهاگئری بی",
- "blockedtext": "<strong>Ù\86Ù\88Ù\85 کارÛ\8cارÛ\8c Ø´Ù\88Ù\85ا Û\8cا تÛ\8cرÙ\86Ø´Û\8aÙ\86 Ø¢Û\8c Ù¾Û\8c Ø´Ù\88Ù\85ا Ù\86اÙ\9bÙ\87اگرÛ\8c بÛ\8cÙ±.</strong>\n\n\n$1 Ú¤Ù\86Ù± Ù\86اÙ\9bÙ\87اگرÛ\8c کردٱ.\nدÙ\84Û\8cÙ\84Ø´ Ù\87ا د اÛ\8cÚ\86اÙ\9b<em>$2</em>.\n\nØ´Ù\88رÛ\8a د Ù\86اÙ\9bÙ\87اگرÛ\8c:$8\nآخر Ù\86اÙ\9bÙ\87اگرÛ\8c:$6\nکارÛ\8cارÛ\8c کاÙ\9b Ù\87ا ڤٱرتÛ\8cÙ± Ù\88 Ù\86اÙ\9bÙ\87اگرÛ\8c بÛ\8cÙ±:$7\n\nØ´Ù\88Ù\85ا Ù\85Û\8c تÛ\8aÙ\86Û\8cت ڤا $1 Û\8cا [[{{MediaWiki:Grouppage-sysop}}|سردÛ\8cÚ¤Û\8aÙ\86کار]] Ù\87Ù±Ù\86Û\8c Ù¾Û\8cÚ¤Ù\86د باÙ\9bÛ\8cرÛ\8cت Ù\88 سÛ\8c Ù\86اÙ\9bÙ\87اگرÛ\8c ڤا Ú¤ Ú\86Ù±Ú© Ú\86Ù\86Ù± کارÛ\8c بٱکÛ\8cت.\nÙ±Ù\84ڤت د Ú¤Û\8cر داشتÛ\8aئÛ\8cت کاÙ\9b Ø´Ù\88Ù\85ا Ù\86Ù\85Û\8c تÛ\8aÙ\86Û\8cت Ú\86Û\8cا Ù±Ù\86جÙ\88Ù\85اÙ\86اÙ\85Ù± کاÙ\9bÙ\84 کردÙ\86 سÛ\8c اÛ\8c کارÛ\8cار Ù\86Ù± Ú¤ کار باÙ\9bÛ\8cرÛ\8cتØ\8c Ù\85ٱر Û\8cÙ± کاÙ\9b Û\8cاÙ\9b Ú¯Ù±Ù\84 تÛ\8cرÙ\86Ø´Û\8aÙ\86 Ù±Ù\86جÙ\88Ù\85اÙ\86اÙ\85Ù± Ù\86ازار Ù\86Ù± [[Special:Preferences|تٱرجÛ\8cئات کارÛ\8cارÛ\8c]] Ø®Ù\88تÛ\8a دÛ\8cارÛ\8c کردÛ\8aئÛ\8cت Ù\88 تÛ\8aÙ\86ستÛ\8aÛ\8cت Ú¤ Ù\86Ù± Ú¤ کار باÙ\9bÛ\8cرÛ\8cت .\nتÛ\8cرÙ\86Ø´Û\8aÙ\86 Ø¢Û\8c Ù¾Û\8c اÛ\8cساÙ\9bÙ\86Û\8c Ø´Ù\88Ù\85ا $3 Ù±Ø\8c Ù\88 Ù\86Ù\88Ù\85 دÛ\8cارکÙ\88Ù\86 Ù\86اÙ\9bÙ\87اگرÛ\8c #$5 Ù±.\nÙ\84Ù\88تÙ\81 بٱکÛ\8cت Ù\87Ù\85Ù± Ú\86Û\8cاÙ\86Ù± د Ù\87ر Ù\87استٱÛ\8cÛ\8c کاÙ\9b دارÛ\8cت بÛ\8aئÛ\8cت.",
+ "blockedtext": "<strong>Ù\86Ù\88Ù\85 کارÛ\8cارÛ\8c Ø´Ù\85ا Û\8cا تÛ\8cرÙ\86Ø´Ù\88Ý© Ø¢Û\8c Ù¾Û\8c Ø´Ù\85ا Ù\86Ù\87اگرÛ\8c بÛ\8cÙ±.</strong>\n\n\n$1 Ú¤Ù\86Ù± Ù\86Ù\87اگرÛ\8c کردٱ.\nدÙ\84Ù\9bÛ\8cÙ\84Ù\9bØ´ Ù\87ا د اÛ\8cÚ\86اÙ\92<em>$2</em>.\n\nشرÛ\8a د Ù\86Ù\87اگرÛ\8c:$8\nآخر Ù\86Ù\87اگرÛ\8c:$6\nکارÛ\8cارÛ\8c کاÙ\92 Ù\87ا ڤٱرتÛ\8cÙ± Û\89 Ù\86Ù\87اگرÛ\8c بÛ\8cÙ±:$7\n\nØ´Ù\85ا Ù\85ؽ تÙ\88Ù\86ؽت ڤا $1 Û\8cا [[{{MediaWiki:Grouppage-sysop}}|سردÛ\8cÚ¤Ù\88Ù\86کار]] Ù\87Ù\86Û\8c پاÙ\9bÚ¤Ù±Ù\86 باÙ\9bÛ\8cرؽت Û\89 سÛ\8c Ù\86Ù\87اگرÛ\8c ڤا Ú¤Ù± Ú\86Ù±Ú© Ú\86Ù\86Ù± کارÛ\8c بٱکؽت.\nÙ±Ù\84ڤٱت د Ú¤Û\8cر داشتÛ\8aؽت کاÙ\92 Ø´Ù\85ا Ù\86Ù\85ؽ تÙ\88Ù\86ؽت Ú\86Û\8cا Ù±Ù\86جÙ\88Ù\85 Ù\86اÙ\85Ù± Ú©Ù\84Ù\9b کردÙ\86 سÛ\8c اؽ کارÛ\8cار Ù\86اÙ\92 Ú¤ کار باÙ\9bÛ\8cرؽتØ\8c Ù\85ٱر Û\8cÙ± کاÙ\92 Û\8cاÙ\9b تÛ\8cرÙ\86Ø´Ù\88Ý© Ù±Ù\86جÙ\88Ù\85 Ù\86اÙ\85Ù± Ù\86ازار Ù\86Ù± [[Special:Preferences|تٱرجÛ\8cÛ\8cات کارÛ\8cارÛ\8c]] Ø®Ù\88تÙ\88 دؽارÛ\8c کردÛ\8aؽت Û\89 تÙ\88Ù\86سÛ\8aؽت Ú¤Ù±Ù\86اÙ\92 Ú¤ کار باÙ\9bÛ\8cرؽت .\nتÛ\8cرÙ\86Ø´Ù\88Ý© Ø¢Û\8c Ù¾Û\8c اÛ\8cسÙ\86Û\8c Ø´Ù\85ا $3 Ù±Ø\8c Û\89 Ù\86Ù\88Ù\85 دؽارکÙ\88Ý© Ù\86Ù\87اگرÛ\8c #$5 Ù±.\nÙ\84Ù\88تÙ\81 بٱکؽت Ù\87Ù\85Ù± Ú\86Û\8cاÙ\86اÙ\92 د Ù\87ٱر Ù\87استاÙ\9bÛ\8cؽ کاÙ\92 دارؽت بÛ\89ؽت.",
"autoblockedtext": "<strong>نوم کاریاری شوما یا تیرنئشوٙن آی پی شوما سی یە کئ یئ گئل کاریاری هأنی ڤئ نە ڤئ کار گئرئتە خودأنجومأن ڤئ دأس $1 نئهاگئری بییە.</strong>\n\n\n$1 ڤئنە نئهاگئری کئردە.\nدألیلئش ها د ئیچئ\n<em>$2</em>.\n\nشوروٙ د نئهاگئری:$8\nآخئر نئهاگئری:$6\nکاریاری کئ ها ڤأرتیە و نئهاگئری بییە:$7\n\nشوما می توٙنیت ڤا $1 یا [[{{MediaWiki:Grouppage-sysop}}|سأردیڤوٙنکار]] هأنی پئیڤأند بئیریت و سی نئهاگئری ڤا ڤئ چأک چئنە کاری بأکیت.\nألڤأت د ڤیر داشتوٙئیت کئ شوما نئمی توٙنیت خوصۉصیأت أنجومانامە کئل کئردئن سی ئی کاریار نە ڤئ کار بئیریت، مأر یە کئ یئ گئل تیرنئشوٙن أنجومانامە نازار نە [[Special:Preferences|تأرجیحات کاریاری]] خوتوٙ دیاری کئردئوٙیت و توٙنئستوٙیت ڤئ نە ڤئ کار بئیریت .\nتیرنئشوٙن آی پی ئیسئنی شوما $3ە، و نوم دیارکون نئهاگئری #$5 ە.\nلوطف بأکیت هأمە چیانە د هأر حاستە یی کئ داریت بوٙئیت.",
"blockednoreason": "هیچ دألیلی گوتە نأبییە",
"whitelistedittext": "$1 لوطف بأکیت بألگە یا نە ڤیرایئشت کاری بأکیت.",
"newarticle": "تازە",
"newarticletext": "شوما هایین ڤا دئما هوم پئیڤأندی کئ ڤوجوٙد نارە.\nسی رأڤأندیاری بألگە.شوروٙ بأکیت مینئ جأڤە هاری بأنیسیت (سی دوٙنئسئن بیشتئر سئیل [$1 ] بأکیت).\nأر شوما سی ئشتئڤا کئردئن هائیت ئیچئ، ری دوگمە ڤادئما رأتئن دوڤارتە نیأر بأپوٙرنیت.",
"anontalkpagetext": "----",
- "noarticletext": "د ایساٛنیا ای بلگٱ نیسسٱ ڤوجۊد ناشتٱ.\nشوما می تۊنیت د[[Special:Search/{{PAGENAME}}|بگردید]] د ای بلگٱ ای د بلگٱ هٱنی یا <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} د نۏ پی جۊری بۊٱ]</span>، <span class=\"plainlinks\">[{{fullurl:{{FULLPAGENAME}}|action=edit}} یا ای بلگٱ ناٛ ڤیرایشت بٱکیت]</span>.",
- "noarticletext-nopermission": "د ایساٛنیا ای بلگٱ نیسسٱ یی ۋوجۊد ناشتٱ.\nشوما می تۊنیت د[[Special:Search/{{PAGENAME}}|بگردید]] د ای بلگٱ یا د بلگٱ هٱنی یا <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} د نۏ پی جۊری بۊٱ]</span>، <span class=\"plainlinks\">[{{fullurl:{{FULLPAGENAME}}|action=edit}}</span>.ۋلی شوما ساٛلا یٱ نٱ کاٛ ای بلگٱ ناٛ راس بٱکیت ناریت.",
+ "noarticletext": "د ایسنؽا اؽ بٱلگٱ نیسسٱ ڤجۊد ناشتٱ.\nشما مؽ تونؽت د[[Special:Search/{{PAGENAME}}|بٱگٱردؽد]] د اؽ بٱلگٱ اؽ د بٱلگٱ هنی یا <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} د نۊ پاٛجۊری بۊئٱ]</span>، <span class=\"plainlinks\">[{{fullurl:{{FULLPAGENAME}}|action=edit}} یا ای بٱلگٱ ناْ ڤیرایش بٱکؽت]</span>.",
+ "noarticletext-nopermission": "د ایسنؽا اؽ بٱلگٱ نیسساٛیؽ ڤجۊد ناشتٱ.\nشما مؽ تونؽت د[[Special:Search/{{PAGENAME}}|بٱگردؽد]] د اؽ بٱلگٱیا د بٱلگٱ هنی یا <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} د نۊ پاٛجۊری بۊئٱ]</span>، <span class=\"plainlinks\">[{{fullurl:{{FULLPAGENAME}}|action=edit}}</span>.ڤلی شما سلا یٱناْ کاْ اؽ بٱلگٱ ناْ دۏرس بٱکؽت نارؽت.",
"missing-revision": "ڤانئیأری #$1 د بألگە یی کئ نومئش ڤئنە \"{{FULLPAGENAME}}\" ڤوجوٙد نارە.\n\nگاسی سی یئ گئل ڤیرگار ڤئ هئنگوم نأبییە کئ د یئ گئل بألگە پاکسا بییە هوم پئیڤأند بییە رأڤأندیاری بییە.\nگاسی جوزئیات د[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log] دیاری بأکأن.",
"userpage-userdoesnotexist": "حئساڤ کاریاری \"$1\" ثأڤت نأم نأبییە.\nأر میھایت ئی بألگە نئ بأسازیت یا ڤیرایئشت کاری بأکیت یئ گئل ڤارئسی أنجوم بئیتوٙ.",
"userpage-userdoesnotexist-view": "هساو کاریاری \"$1\" سٱبت ناٛییٱ.",
"blocked-notice-logextract": "ئی کاریار د ئیسئنی نئھاگئری بییە.\nآخئری پئرئستنوٙمە نئھاگئری ڤامین یاریا د ھار سی سأرچئشمە آمادە کاری بییە:",
- "clearyourcache": "<strong>د ڤیر داشتوٙیت:</strong> نئها ئمایە کاری،گاسی شوما مأژبوٙر د ڤئ کار ڤأنئن ڤیرگە قام بییە دوڤارتە نییأر خوتوٙ سی دیئن ئی آلئشتکاری بوٙئیت.\n* <strong>فایئرفاکس/ سأفأری:</strong> بأپوٙرنیت ری<em>شیفت</em> ئوٙسئ کئ می پوٙرنیت <em> ڤئ د نۊ سۊڤار موٙە </em>یا ھأنی ری <em>Ctrl-F5</em> بأپوٙرنیت یا<em>Ctrl-R</em> (<em>⌘-R</em> د ساموٙنە مأک)\n* <strong>گوٙگئل کئروم:</ strong>بأپوٙرنیت ری <em>Ctrl-Shift-R</em> (<em>⌘-Shift-R</em> یا د ساموٙنە)\n* <strong>ئینتئرنئت ئکسپئلورئر:</strong> <em>Ctrl</em> نە ڤاداریت ئوٙسئ کئ می پوٙرنیت <em>ری کئلیت رئفرئش</em>،یا ڤاداشتیتە<em>Ctrl-F5</em>\n* <strong>اوپرا:</strong> ڤیرگە قام بییە د <em>أڤزاریا→ ئولأڤی یأتیانە پاکسا بأکیت</em>",
+ "clearyourcache": "<strong>ڤ ڤیر داشتۊؽت:</strong> نوئا آمایٱ کاری،گاسؽ شما مٱجبۊر د ڤ کار ڤٱنن ڤیرگٱ قایم بیٱ دوئارتٱ نییٱر خوتوݩ سی دیین اؽ آلشتکاری بۊیؽت.\n* <strong>فایرفاکس/ سٱفٱری:</strong> بٱپۊرنؽت ری<em>شیفت</em> اۊساْ کاْ ؽ پۊرنؽت <em> ڤٱ د نۊ سڤار مۊئٱ </em>یا ھنی ری <em>Ctrl-F5</em> بٱپۊرنؽت یا<em>Ctrl-R</em> (<em>⌘-R</em> د ساموٙنە مأک)\n* <strong>گۊگل کروم:</ strong>بٱپۊرنؽت ری <em>Ctrl-Shift-R</em> (<em>⌘-Shift-R</em> یا د سامونٱ)\n* <strong>اینترنت اْکسپلورر:</strong> <em>Ctrl</em> ناْ ڤادارؽت اۊساْ کاْ مؽپۊنؽت <em>ری کلٛیلٛ رفرش</em>،یا ڤاداشتیتٱ<em>Ctrl-F5</em>\n* <strong>اوپرا:</strong> ڤیرگٱ قایم بییٱ د <em>أڤزارؽا→ آولٱڤؽٱتؽاناْ پاکسا بٱکؽتت</em>",
"usercssyoucanpreview": "<strong>چی ڤأرتیە گئر:</strong> دوگمە\"{{int:showpreview}}\" سی ئزماشت کاری سی ئس ئس تازە دئما ئمایە کاری ڤئ کار بئیریت.",
"userjsyoucanpreview": "<strong>چی ڤأرتیە گئر:</strong> دوگمە\"{{int:showpreview}}\" سی ئزماشت کاری جاڤا ئسکئریپت تازە دئما ئمایە کاری ڤئ کار بئیریت.",
"usercsspreview": "<strong>د ڤیر داشتوٙئیت کئ شوما فأقأط می توٙنیت سی ئس ئس کاریاری توٙنە پیش سئیل بأکیت. ڤئ ئیسئنی ئمایە نأبییە!</strong>",
"searchprofile-everything-tooltip": "همٱ مؽنونٱیا ناْ پۊ جۊری كو (شاملاْ بٱلگٱيا چٱک چنٱ)",
"searchprofile-advanced-tooltip": "نوم جايا نوم دؽار بٱگٱرد",
"search-result-size": "$1 ({{PLURAL:$2|1 کلٱمٱ|$2 کلٱمٱیا}})",
- "search-result-category-size": "{{PLURAL:$1|1 أندوم|$1 أندومیا}} ({{PLURAL:$2|1 زیردأسە|$2 زیردأسە یا}}، {{PLURAL:$3|1 جانیا|$3 جانیایا}}",
+ "search-result-category-size": "{{PLURAL:$1|1 ٱندوم|$1 ٱندومؽا}} ({{PLURAL:$2|1 زؽردٱسٱ|$2 زؽردٱسٱیا}}، {{PLURAL:$3|1 جانیا|$3 جانیایا}}",
"search-redirect": "(ڤورگشتن سی $1)",
"search-section": "(بهرجا $1)",
"search-category": "(دسه $1)",
"right-bot": "باور بیه چی یه گل پردازشت خودانجوم",
"right-nominornewtalk": "حیرده ویرایشت بلگه یا چک چنه وه شکلی که باعث گوتن پیغوم تازه نبوئه.",
"right-apihighlimits": "سخم بالاتر د وه کار بسن API",
- "right-writeapi": "د Ù\86Û\8cسÙ\86Ù\86 اÛ\8c Ù¾Û\8c Ø¢Û\8c Ù\88Ù\87 کار بئÛ\8cرÛ\8cت",
+ "right-writeapi": "د Ù\86Û\8cسٱÙ\86Ù\86 اÙ\9bÛ\8c Ù¾Û\8c Ø¢Û\8c Ú¤ کار باÙ\9bÛ\8cرؽت",
"right-delete": "بلگیا نه پاکسا کو",
"right-bigdelete": "بلگه یایی که ویرگار گپی دارن پاکسا بکیت",
"right-deletelogentry": "پاکسا کردن و ناپاکسا کردن داده واریایی ویجه ای د پهرستنومه",
"right-managechangetags": "راس کئردئن [[Special:سأردیسیا|سأردیسیا]] پاکسا کئردئن د رئسینە جا",
"right-applychangetags": "ڤئ کار گئرئتئنئ [[Special:سأردیسیا|سأردیسیا]] ڤاگئرد آلئشتیا ھأرکومئشوٙ.",
"right-changetags": "Add and remove arbitrary [[Special:Tags|tags]] on individual revisions and log entries",
- "newuserlogpage": "راس بÛ\8cÙ\87 Ù\88ا کاریار",
+ "newuserlogpage": "دÛ\8fرس بÛ\8cÙ± Ú¤ا کاریار",
"newuserlogpagetext": "یه پهرستنومه راس بیئن کاریاره",
"rightslog": "پهرستنومه حقوق کاریار",
"rightslogtext": "یه پهرستنومه آلشتیا حقوق کاریاره.",
"recentchanges-label-unpatrolled": "ای ويرايشت هنی تيه واداشت نبيه",
"recentchanges-label-plusminus": "انازه بلگه وه شمار ای بایتیا آلشت کرده.",
"recentchanges-legend-heading": "<strong>میراث:</strong>",
- "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (همچنو بوینیت [[ویجه:بلگیا تازه|نوم گه بلگیا تازه]])",
+ "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (همچنو باٛینؽت [[ڤیژٱ:بٱلگٱیا تازٱ|نوم گٱ بٱلگٱیا تازٱ]])",
"recentchanges-legend-plusminus": "(<em>±123</em>)",
"rcnotefrom": "د هار آلشتیا د $2 هیئن(د بال د $1 نشون دئه بیه)",
"rclistfrom": "آلشتیا تازه ایی که وا $3 $2 شرو بیه نشونش بئه",
"rcshowhideminor": "ڤیرایشتیا فاٛرٱ کوچک $1",
"rcshowhideminor-show": "نشو دئن",
"rcshowhideminor-hide": "قام کردن",
- "rcshowhidebots": "$1 رÙ\88اتÙ\8aا Û\8cا بÙ\88تÙ\8aا",
+ "rcshowhidebots": "$1 رÙ\88باتؽا Û\8cا بÙ\88تؽا",
"rcshowhidebots-show": "نشۊ دٱئن",
"rcshowhidebots-hide": "قام کردن",
- "rcshowhideliu": "$1 کارÛ\8cارÛ\8cا Ø«Ù\88ت Ù\86اÙ\85 کردÙ\87",
+ "rcshowhideliu": "$1 کارÛ\8cارÛ\8cا سٱبت Ù\86Ù\88Ù\85 کردٱ",
"rcshowhideliu-show": "نشۊ دٱئن",
"rcshowhideliu-hide": "قام کئردئن",
"rcshowhideanons": "کاریار نادیار $1",
"filehist-filesize": "انازه فایل",
"filehist-comment": "ڤیر ۉ باڤٱر",
"imagelinks": "ڤ کار گرتن جانؽا",
- "linkstoimage": "دمال بيه {{PLURAL:$1|ديس ونيا بلگه|$1 ديس ون بلگيا}} دای فایل:",
- "linkstoimage-more": "بیشتر د $1 بلگه د ای جانیا هوم پیوند {{PLURAL:$1|بیه|بینه}}.\nنومگه هاری تئنا {{PLURAL:$1|اولین هوم پیوند|اولین $1 هوم پیوند}} د ای بلگه نه نشو می ئه.\n[[Special:WhatLinksHere/$2|نومگه کامل]] ئم هیئش.",
- "nolinkstoimage": "ایچه هیژ بلگه ای سی هوم پیوند بیئن وا ای جانیا نی",
+ "linkstoimage": "دۏنبال بيٱ {{PLURAL:$1|ديس ڤنؽا بٱلگٱ|$1 ديس ڤنؽا بٱلگٱيا}} د اؽ فایلٛ:",
+ "linkstoimage-more": "بؽشتر د $1 بٱلگٱ د اؽ جانؽا هوم پاٛڤٱن {{PLURAL:$1|بٱ|بینٱ}}.\nنومگٱ هاری تٱنڳؽا{{PLURAL:$1|ٱڤلی هوم پاٛڤٱن|ٱڤلی $1 هوم پاٛڤٱن}} د ؽ بٱلگٱ ناْ نشوݩ مؽ یٱ.\n[[Special:WhatLinksHere/$2|نومگٱ کامل]] ٱم هؽسش.",
+ "nolinkstoimage": "ایچاْ هیچ بٱلگاٛیی سی هوم پیاٛڤٱن بیین ڤا اؽ جانؽا نؽ",
"morelinkstoimage": " [[ویجه:چه هوم پیوندی ها ایچه/$1|هوم پیوندیا هنی]]سی ای جانیا نه بونیت.",
"linkstoimage-redirect": "$1 (واگردونی جانیا) $2",
"duplicatesoffile": "{{PLURAL:$1|جانیا|جانیایا}} هاری نسقه تکراری ای جانیا {{PLURAL:$1|هئ|هئن}} ([[Special:FileDuplicateSearch/$2|دونسمنیا هنی]]):",
"undelete-show-file-submit": "هأری",
"namespace": "نوم جا",
"invert": "گلٛٱڤرچی بیین بٱرعٱسک بۊئٱ",
- "tooltip-invert": "د ری ای جعوه بپورنیت و آلشتیایی نه که د مینجا نوم ورگه انتخاو بیه انجوم بینه قام بکیت(و ار نوم ورگه شریکی وارسی بیه)",
+ "tooltip-invert": "د ری اؽ جٱڤٱ بٱپۊرنؽت ۉ آلشتؽایؽ ناْ کاْ د مؽنجا نوم ڤرگٱ اْنتخاو بیٱ ٱنجوم بینٱ قایم بٱکؽت(ۉ ٱر نوم ڤرگٱ شریکی ڤارسی بیٱ)",
"tooltip-whatlinkshere-invert": "ای جعون نه سی نهو کردن هوم پیوند بلگه یایی که نوم جاشو انتخاو بیه، انتخاو بکیت.",
- "namespace_association": "نوم جایا یکاگرته",
- "tooltip-namespace_association": "ای جعوه نه وارسی بکیت ای جعوه د ور گرته چک چنه یا داسون نوم ورگه شریکی و نوم ورگه انتخاو بیه ئه",
+ "namespace_association": "نوم جایا یٱکاگرتٱ",
+ "tooltip-namespace_association": "اؽ جٱڤٱ ناْ ڤارسی بٱکؽت اؽ جٱڤٱ د ڤٱر گرتٱ چٱک چنٱیا داسوݩ نوم ڤرگٱ شریکی ۉ نوم ڤرگٱ اْنتخاو بیٱ آ",
"blanknamespace": "ٱسلی",
"contributions": "{{GENDER:$1|کاریار}} هومیاریا",
"contributions-title": "ھومیاری كاریار سی $1",
"blocklist-nousertalk": "نبوئه بلگه چک چنه خوتونه ویرایشت بکید",
"ipblocklist-empty": "جاگه نوم گه حالیه",
"ipblocklist-no-results": "دسرسی نوم کاریاری یا تیرنشون آی پی حاسته بیه نهاگری نبیه.",
- "blocklink": "Ù\86Ù\87اگرÛ\8c بÛ\8aٱ",
+ "blocklink": "Ù\86Ù\88ئاگرÛ\8c بÛ\8aئٱ",
"unblocklink": "بی قطی",
"change-blocklink": "اجازه نديئن سی آلشت",
"contribslink": "هومیاریا",
"tooltip-pt-createaccount": "شما تٱشڤیق بیتٱ کاْ یاٛ هساو دۏرس بٱکؽت ۉ بؽاؽت ڤامؽن؛ ڤلی اؽ کار اْجباری نؽ.",
"tooltip-ca-talk": "سالفٱ دبارٱ مینونٱ بٱلگٱ.",
"tooltip-ca-edit": "ڤیرایش ایٛ بٱلگٱ",
- "tooltip-ca-addsection": "د یه گل بهرجا هنی شرو بک",
+ "tooltip-ca-addsection": "د یاٛ بهرجا هنی شرۊ بٱک",
"tooltip-ca-viewsource": "ای بلگه پر و پیم بيه.\nشما تونيت سرچمه ش بئوينيت",
"tooltip-ca-history": "دوئرٱ دیین اؽ بٱلگٱ",
"tooltip-ca-protect": "ای بلگه نه حفاظت بكيد",
"tooltip-t-whatlinkshere": "یاٛ نومگٱ د کولٛ بٱلگٱیایی کاْ ایچاْ هوم پاٛڤٱن دارٱن.",
"tooltip-t-recentchangeslinked": "آلشتؽا تازٱ مؽن بٱلگٱیایی کاْ د اؽ بٱلگٱ هوم پاٛڤٱن بینٱ",
"tooltip-feed-rss": "هوال حون آر اس اس سی ای بلگه",
- "tooltip-feed-atom": "حوال هون اتمی سی ای بلگه",
+ "tooltip-feed-atom": "هڤال هۊن ٱتومی سی اؽ بٱلگٱ",
"tooltip-t-contributions": "یاٛ گاٛل سیائٱ هومیاری سی {{GENDER:$1|ای کاریار}}",
- "tooltip-t-emailuser": "سی ای كارور ايميل كل كو",
+ "tooltip-t-emailuser": "سی اؽ كاریار ايماٛیل کلٛ كو",
"tooltip-t-info": "دونسمنیا بیشتر دباره ای بلگه",
"tooltip-t-upload": "سڤار کردن جانؽایا",
"tooltip-t-specialpages": "مؽناْ هٱمٱ بٱلگٱیا ڤیژٱ",
"tooltip-ca-nstab-mediawiki": "دیاٛن پیغوم سامۊنٱ",
"tooltip-ca-nstab-template": "ديئن چۊٱ",
"tooltip-ca-nstab-help": "ديئن بلگه هومیاری",
- "tooltip-ca-nstab-category": "ديئن بلگه دسه بنی",
+ "tooltip-ca-nstab-category": "ديین بٱلگٱ دٱسٱ بٱنی",
"tooltip-minoredit": "یه نه د عنوان حیرده ویرایشت ثوت کو",
"tooltip-save": "آلشتیاتۊنٱ اٛمایٱ بٱکیت",
"tooltip-preview": "پیش سیل آلشتیاتو،لطف بکیت وه نونه دما د اماییه کاریشو وه کار بیئریت!",
"widthheight": "$1 × $2",
"widthheightpage": "$1 × $2, $3 {{PLURAL:$3|بلگه|بلگه یا}}",
"file-info": "انازه جانیا: $1, MIME type: $2",
- "file-info-size": "$1 × $2 پیکسل, انازه فایل: $3, MIME نوع: $4",
+ "file-info-size": "$1 × $2 پیکسل, ٱندازٱ فایل: $3, MIME نوع: $4",
"file-info-size-pages": "$1 × $2 pixels, انازه جانیا: $3, MIME type: $4, $5 {{PLURAL:$5|بلگه|بلگه یا}}",
"file-nohires": "عسك ون بالاتري دش ني",
"svg-long-desc": "جانیا اٛس ۋی جی, نومی $1 × $2 پیکسل, ٱنازٱ جانیا: $3",
"svg-long-desc-animated": "جانیا جمشدار اس وی جی .نومنا $1 × $2 پيكسل،انازه جانیا:$3",
"svg-long-error": "جانیا اس وی جی نامعتور:$1",
- "show-big-image": "جانیا اصلی",
- "show-big-image-preview": "انازه ای پیش سیل:$1.",
- "show-big-image-other": "Ù\87Ù\86Û\8c{{PLURAL:$2|Ú¯Ù¾ Ù\86Ù\85ا کردÙ\86|Ú¯Ù¾ Ù\86Ù\85ا کردÙ\86Û\8cا}}: $1.",
+ "show-big-image": "جانؽا ٱسلی",
+ "show-big-image-preview": "ٱندازٱ اؽ پیش ساٛلٛ:$1.",
+ "show-big-image-other": "Ù\87Ù\86Û\8c{{PLURAL:$2|گٱپ Ù\86Ù\85ا کردÙ\86|Ú¯Û\89Ù¾ Ù\86Ù\85ا کردÙ\86ؽا}}: $1.",
"show-big-image-size": "$1 × $2 پیکسل",
"file-info-gif-looped": "حلقه دار",
"file-info-gif-frames": "$1 {{PLURAL:$1|فریم|فریمیا}}",
"version-libraries": "کتاو حونه یا پورسه بیه",
"version-libraries-library": "کتاوگه",
"version-libraries-version": "نسقه",
- "redirect": "واگردونی وا جانیا،بلگه یا وانیئری نوم دیارکو",
- "redirect-summary": "ای بلگه ویجه وا جانیا (نوم جانیا هیئش)، بلگه (شماره شناسیار بلگه یا شماره نسقه دیار بیه) یا بلگه کاریاری (شناسیار عددی کاریاری دیار بیه) واگردونی بوئه. طرز وه کار گرتن: [[{{#Special:Redirect}}/file/Example.jpg]]، \n[[{{#Special:Redirect}}/page/64308]]، [[{{#Special:Redirect}}/revision/328429]] یا [[{{#Special:Redirect}}/user/101]].",
+ "redirect": "ڤاگردونی ڤا جانؽا،بٱلگٱیا ڤانیری نوم دؽارکوݩ",
+ "redirect-summary": "اؽ بٱلگٱ ڤیژٱ ڤا جانؽا (نوم جانؽا هؽسش)، بٱلگٱ (شمارٱ شناسیار بٱلگٱ یا شمارٱ نۏسخٱ دؽار بیٱ) یا بٱلگٱ کاریاری (شناسؽار عدٱدی کاریاری دؽار بیٱ) ڤاگٱردونی بۊئٱ. تٱرز ڤ کار گرتن: [[{{#Special:Redirect}}/file/Example.jpg]]، \n[[{{#Special:Redirect}}/page/64308]]، [[{{#Special:Redirect}}/revision/328429]] یا [[{{#Special:Redirect}}/user/101]].",
"redirect-submit": "رو",
"redirect-lookup": "پی جوری:",
"redirect-value": "ارزایشت:",
"intentionallyblankpage": "ای بلگه عمدن حالی هشته بیه",
"external_image_whitelist": "یه خط نه ول بکید چی وه<pre>",
"tags": "سردیسیا آلشت دئن خو",
- "tag-filter": "فيلتر [[Special:سردیس|سردیسیا]]:",
+ "tag-filter": "فيلٛتر [[Special:سٱردیس|سٱردیسؽا]]:",
"tag-filter-submit": "فيلتر",
"tag-list-wrapper": "[[Special:سردیسؽا|{{PLURAL:$1|سردیس|سردیسؽا}}]]: $2",
"tags-title": "سردیسیا",
"botpasswords-label-grants": "अनुदान आवेदन:",
"botpasswords-label-grants-column": "प्रदान कएल",
"botpasswords-bad-appid": "बोट नाम \"$1\" मान्य नै अछि।",
+ "botpasswords-created-title": "बॉट पासवर्ड निर्मित बनल",
"resetpass_forbidden": "कूटशब्द नै बदलल जा सकैए।",
"resetpass_forbidden-reason": "कूटशब्द नै बदलल जा सकैए: $1",
"resetpass-no-info": "अहाँकेँ ऐ पन्नाकेँ सोझे प्रयोग करबालेल सम्प्रवेशित हुअए पड़त।",
"rcfilters-invalid-filter": "अमान्य फ़िल्टर",
"rcfilters-filterlist-title": "चलनीसभ",
"rcfilters-highlightmenu-title": "रंग चुनु",
+ "rcfilters-filterlist-noresults": "कोई फिल्टर नहीं भेटल",
"rcfilters-filtergroup-authorship": "लेखक योगदान",
"rcfilters-filter-editsbyself-label": "अहाक बदलावसभ",
"rcfilters-filter-editsbyself-description": "अहाक अपन योगदान।",
"rcfilters-filter-reviewstatus-auto-label": "सवापरिक्षित",
"rcfilters-filtergroup-significance": "महत्व",
"rcfilters-filter-minor-label": "छोट सम्पादन",
+ "rcfilters-filter-major-label": "गैर-मामूली संपादन",
"rcfilters-filtergroup-watchlist": "देखेल पन्नासभ",
"rcfilters-filter-watchlist-watched-label": "साकांक्षसूची",
"rcfilters-filter-watchlist-watchednew-label": "नया ध्यानसूची बदलाव",
"rcfilters-filter-watchlist-notwatched-label": "ध्यानसूची में नैछि",
+ "rcfilters-filtergroup-watchlistactivity": "ध्यानसूची क्रियाकलाप",
"rcfilters-filter-watchlistactivity-unseen-label": "परिवर्तन सभ चुनु",
"rcfilters-filter-watchlistactivity-seen-label": "परिवर्तन सभ चुनु",
"rcfilters-filtergroup-changetype": "बदल क प्रकार:",
"rcfilters-filter-lastrevision-label": "नूतन संशोधन",
"rcfilters-filter-excluded": "अपवर्जित",
"rcfilters-tag-prefix-namespace-inverted": " $1 <strong>:नैछि</strong>",
+ "rcfilters-exclude-button-off": "चयनित निकालु",
+ "rcfilters-exclude-button-on": "चयनित क छोड़कर",
"rcfilters-view-tags": "पन्नाक संपादनसभ",
"rcfilters-liveupdates-button": "अखुनका अद्यतन",
"rcfilters-target-page-placeholder": "पृष्ठ(अथवा श्रेणी) क नाम भरू",
"ipbreason-dropdown": "*सामान्य प्रतिबन्ध कारण\n** गलत सूचना घुसेनाइ\n** पन्ना सभसँ पाठ हटेनाइ\n** बाहरी जालस्थलक अवांछित लागि\n** फालतू/ अवांछित सामिग्रिक पान्नामे घुसाएब\n** धमकीबला व्यवहार/ तंग करब\n** कएक खाताकेँ गरिआएब\n** अवांछित प्रयोक्तानाम",
"ipb-hardblock": "ऐ अनिकेत पतासँ सम्प्रवेशित प्रयोक्ताकेँ सम्पादनसँ रोकू",
"ipbcreateaccount": "खाता निर्माण रोकू",
- "ipbemailban": "पà¥\8dरयà¥\8bà¤\95à¥\8dताà¤\95à¥\87à¤\81 à¤\88-पतà¥\8dर पठà¥\87बासà¤\81 रà¥\8bà¤\95à¥\82",
+ "ipbemailban": "à¤\87मà¥\87ल पठाबà¥\80",
"ipbenableautoblock": "स्वचालित रूपेँ ऐ प्रयोक्ताक ऐ अनिकेतक प्रयोगकेँ प्रतिबन्धित करू, आ कोनो दोसर अनिकेत पताकेँ सेहो जतएसँ ओ सम्पादनक प्रयास करथि",
"ipbsubmit": "ऐ प्रयोक्ताकेँ रोकू",
"ipbother": "दोसर समए:",
"ipb-confirm": "प्रतिबन्ध सुनिश्चित करू",
"ipb-partial": "आंशिक",
"ipb-pages-label": "पन्ना",
+ "ipb-namespaces-label": "नामस्थान",
"badipaddress": "अमान्य आईपी पता",
"blockipsuccesssub": "प्रतिबन्ध सफल भेल",
"blockipsuccesstext": "[[Special:Contributions/$1|$1]] प्रतिबन्धित कएल गेल।<br />\nदेखू [[Special:BlockList|IP block list]] प्रतिबन्धक पुनरीक्षण लेल।",
"ipb-blocklist": "अखुनका प्रतिबंधित देखू",
"ipb-blocklist-contribs": "$1 लेल अवदान",
"ipb-blocklist-duration-left": "$1 बाकी",
+ "block-actions": "अवरोध कार्यवाही:",
"block-expiry": "खतम हएत:",
+ "block-options": "अतिरिक्त विकल्प:",
+ "block-prevent-edit": "सम्पादन",
+ "block-reason": "कारण:",
+ "block-target": "सदस्यनाम या आईपी पता:",
"unblockip": "प्रयोक्ताकेँ प्रतिबन्ध सँ हटाबी",
"unblockiptext": "पहिनेसँ प्रतिबन्धित अनिकेत वा प्रयोक्तानामकेँ लिखबाक अधिकार देबा लेल निचुलका आवेदन भरू।",
"ipusubmit": "ई प्रतिबन्ध हटाउ",
"emailblock": "ई-पत्र प्रतिबन्धित",
"blocklist-nousertalk": "अपन वार्ता पन्ना सम्पादित नै कऽ सकब",
"blocklist-editing": "सम्पादन कऽ रहल छी",
+ "blocklist-editing-page": "पृष्ठ",
+ "blocklist-editing-ns": "नामस्थान",
"ipblocklist-empty": "प्रतिबन्धसूची खाली अछि।",
"ipblocklist-no-results": "आग्रह कएल अनिकेत वा प्रयोक्तानाम प्रतिबन्धित नै कएल गेल।",
"blocklink": "प्रतिबन्धित",
"tags-edit-manage-link": "ट्याग व्यवस्थापन",
"tags-edit-revision-selected": "[[:$2]] {{PLURAL:$1|क|के}} चयनित अवतरण:",
"tags-edit-logentry-selected": "{{PLURAL:$1|चुनल लौग घटना|चुनल लौग घटनासभ}}:",
+ "tags-edit-existing-tags": "मौजूद टैग",
"tags-edit-existing-tags-none": "<em>कोनो नै</em>",
"tags-edit-new-tags": "नव ट्याग:",
"tags-edit-add": "इ ट्यागसभ जोडी:",
"logentry-newusers-create2": "$1 {{GENDER:$2|बनाएल}} {{GENDER:$4|एकटा प्रयोक्ता खाता}} $3",
"logentry-newusers-byemail": "$1 द्वारा प्रयोक्ता खाता $3 {{GENDER:$2|बनाओल}} गेल आ कूटशब्द ई-पत्र द्वारा भेजल गेल",
"logentry-newusers-autocreate": "खाता $1 छल {{GENDER:$2|बनाएल}} स्वतः",
+ "logentry-protect-protect": "$1 ने $3 $4 {{GENDER:$2|सुरक्षित}} किरल।",
"logentry-upload-upload": "$1 {{GENDER:$2|ए}} $3 अपलोड केलक",
+ "log-name-managetags": "समय प्रबंधन लॉग",
"logentry-managetags-create": "$1 {{GENDER:$2 बनाएल}} टैग $4",
"log-name-tag": "ट्याग लौग",
"rightsnone": "(कोनो नै)",
"authmanager-email-help": "ई-पत्र ठेगान:",
"authmanager-realname-label": "असली नाम",
"authmanager-provider-temporarypassword": "तात्कालिक कूटशब्द:",
+ "authprovider-confirmlink-success-line": "$1 : सफलतापूर्वक जुड़ा।",
"authprovider-resetpass-skip-label": "छाेड",
"authform-newtoken": "टोकन नै अछि । $1",
"authform-notoken": "टोकन नै अछि",
"ipb_expiry_old": "Времето на истекување е постаро од тековното време.",
"ipb_expiry_temp": "Скриените блокирања на корисникот мора да бидат перманентни.",
"ipb_hide_invalid": "Оваа сметка не може да се потисне; има {{PLURAL:$1|повеќе од едно уредување|преку $1 уредувања}}..",
+ "ipb_hide_partial": "Скриените забрани за кориснички имиња мора да важат за цело вики.",
"ipb_already_blocked": "„$1“ е веќе блокиран",
"ipb-needreblock": "$1 е веќе блокиран. Дали сакате да направите промена?",
"ipb-otherblocks-header": "{{PLURAL:$1|Друго блокирање|Други блокирања}}",
"ipb_expiry_old": "Vervaldatum is in het verleden.",
"ipb_expiry_temp": "Blokkades voor verborgen gebruikers moeten permanent zijn.",
"ipb_hide_invalid": "Het is niet mogelijk dit account te verbergen; het heeft meer dan {{PLURAL:$1|één bewerking|$1 bewerkingen}}.",
+ "ipb_hide_partial": "Blokkades die de gebruikersnaam verbergen moeten op de gehele wiki van toepassing zijn.",
"ipb_already_blocked": "\"$1\" is al geblokkeerd",
"ipb-needreblock": "$1 is al geblokkeerd.\nWilt u de instellingen wijzigen?",
"ipb-otherblocks-header": "Andere {{PLURAL:$1|blokkade|blokkades}}",
"ipb_expiry_old": "O tempo de expiração está no passado.",
"ipb_expiry_temp": "Bloqueios com nome de usuário ocultado devem ser permanentes.",
"ipb_hide_invalid": "Não foi possível suprimir esta conta; ela tem mais de {{PLURAL:$1|uma}}edições.",
+ "ipb_hide_partial": "Bloqueios de nome de usuário ocultos devem ser bloqueados em todo o site.",
"ipb_already_blocked": "\"$1\" já se encontra bloqueado",
"ipb-needreblock": "$1 já se encontra bloqueado. Deseja alterar as configurações?",
"ipb-otherblocks-header": "{{PLURAL:$1|Outro bloqueio|Outros bloqueios}}",
"ipb_expiry_old": "Время окончания — в прошлом.",
"ipb_expiry_temp": "Блокировки с сокрытием имени участника должны быть бессрочными.",
"ipb_hide_invalid": "Невозможно скрыть эту учётную запись, с неё сделано более {{PLURAL:$1|одной правки|$1 правок}}.",
+ "ipb_hide_partial": "Скрытые запреты имён участников должны действовать во всей вики.",
"ipb_already_blocked": "«$1» уже заблокирован.",
"ipb-needreblock": "$1 уже {{GENDER:$1|заблокирован|заблокирована}}. Хотите изменить параметры блокировки?",
"ipb-otherblocks-header": "{{PLURAL:$1|1=Другая блокировка|Другие блокировки}}",
"cannotchangeemail": "ಖಾತೆ ಇಮೇಲ್ ವಿಳಾಸೊಲೆನ್ ಈ ವಿಕಿಟ್ ಬದಲರೆ ಆಪುಜಿ",
"emaildisabled": "ಈ ಜಾಲತಾಣಡ್ದ್ ಮಿಂಚಂಚೆ ಕಡಪುಡರ ಆಪುಜ್ಜಿ",
"accountcreated": "ಖಾತೆ ಸೃಷ್ಟಿಯಾತ್‘ಂಡ್.",
- "accountcreatedtext": "ಬಳಕೆದಾರೆ ಖಾತೆ[[{{ns:ಬಳಕೆದಾರೆ}}:$1|$1]]([[{{ns:ಬಳಕೆದಾರೆ ಪಾತೆರ}}:$1|ಪಾತೆರ]])ಗಾದ್ ರಚಿಸಾದ್ ಆತ್ಂಡ್.",
+ "accountcreatedtext": "ಬಳಕೆದಾರೆ ಖಾತೆ[[{{ns:User}}:$1|$1]] ([[{{ns:User talk}}:$1|talk]]) ಗಾದ್ ರಚಿಸಾದ್ಂಡ್.",
"createaccount-title": "ಖಾತೆ ರಚನೆ {{SITENAME}}ಗಾದ್",
"createaccount-text": "ಏರಾಒರಿ ಇರೆನ ಇಮೆಲ್ ವಿಳಾಸೊಗು ಒಂಜಿ ಖಾತೆ ರಚಿಸಾದೆರ್ {{SITENAME}} ($4) ಪುದರ್ \"$2\", ಸಂಕೇತಪದ\"$3\".\nಈರ್ ಉಳಪ್ರವೇಶ ಮಲ್ತ್ ಬೊಕ ಇತ್ತೆನೇ ಸಂಕೇತಪದ ಬದಲಾಲೆ.\nಈ ಖಾತೆ ದೋಷೊಡು ರಚನೆ ಆತಿನಾಂಡ,ಈರ್ ಈ ಸಂದೇಶೊನು ನಿರ್ಲಕ್ಷ ಮಲ್ಪೊಲಿ.",
"login-throttled": "ಈರ್ ದಿಂಜ ಸರ್ತಿ ಉಳಪ್ರವೇಶ ಪ್ರಯತ್ನ ಮಲ್ದರ್.\nದಯಮಲ್ತ್ ನನೊರ ಪ್ರಯತ್ನ ಮಲ್ಪುನ ದುಂಬು $1 ಕಾಪುಲೆ.",
"login-abort-generic": "ಇರೆನ ಲಾಗ್ ಇನ್ ಪೈಲ್ ಆತ್ಂಡ್",
"login-migrated-generic": "ಇರೆನ ಖಾತೆ ವಲಸೆ ಆತ್ಂಡ್,ಬೊಕ ಇರೆನ ಬಳಕೆಪುದರ್ ಈ ವಿಕಿಟ್ ಅಸ್ತಿತ್ವೊಡು ಇಜ್ಜಿ.",
"loginlanguagelabel": "ಬಾಸೆ: $1",
+ "suspicious-userlogout": "ಇರೆನ ಪಿರಗಮನ ಕೋರಿಕೆನ್ ನಿರಾಕರಿಸಾದ್ಂಡ್ ದೇಗಿನ್ನಗ ಅವು ಒಂಜಿ ಕಡಿದಿನ ಜಾಲದರ್ಶಿ ಇಜಿಂಡ ಸಂಗ್ರಹಿತ ನಿಕಟಪ್ರತಿ ಕಡಪುಡುದಿನ ಇಂದ್ ತೋಜುಂಡು",
+ "createacct-another-realname-tip": "ನಿಜವಾಯಿನ ಪುದರ್ ಐಚ್ಚಿಕ.\nಈರ್ (ಪುದರ್)ಕೊರೊಡುಂದು ಆಯ್ಕೆ ಮಲ್ತರ್ಡ,ಅವೆನ್ ಬಳಕೆದಾರೆಗ್ ಕಾರ್ಯಪ್ರಶಸ್ತಿ ಕೊರಿಯರೆ ಗಳಸುಂಡು.",
"pt-login": "ಲಾಗ್ ಇನ್",
"pt-login-button": "ಲಾಗಿನ್ ಆಲೆ",
"pt-login-continue-button": "ಲಾಗಿನ್ ಅದ್ ಮುಂದುವರಿಲೆ",
"pt-createaccount": "ಪೊಸ ಖಾತೆ ಸುರು ಮಲ್ಪುಲೆ",
"pt-userlogout": "ಲಾಗ್ ಔಟ್",
+ "php-mail-error-unknown": " PHP ದ mail() ಕಾರ್ಯೊಡು ಗೊತ್ತಾಂತಿನ ದೋಷ.",
+ "user-mail-no-addy": "ಇಮೇಲ್ ವಿಳಾಸ ದಾಂತೆ ಇಮೇಲ್ ಕಡಪುಡರೆ ಯತ್ನ ಮಲ್ತ್ಂಡ್.",
+ "user-mail-no-body": "ಖಾಲಿ ಇಜಿಂಡ ಅನುಚಿತ ಕುದ್ಯಕಾಯದ ಇಮೇಲ್ ಕಡಪುಡೆರೆ ಯತ್ನ ಮಲ್ತ್ಂಡ್.",
"changepassword": "ಪ್ರವೇಶಪದೊನ್ ಬದಲಾವಣೆ ಮಲ್ಪುಲೆ",
+ "resetpass_announce": "ಉಳಗಮನ ಮುಗಿಸಾರೆ,ಈರ್ ಒಂಜಿ ಪೊಸ ಸಂಕೇತಪದ ಜೋಡಿಸಾವೊಡು.",
"resetpass_header": "ಈ ಖಾತೆದ ಪ್ರವೇಶಪದ ಬದಲಾವಣೆ ಮಲ್ಪುಲೆ",
"oldpassword": "ಪರ ಪ್ರವೇಶಪದ",
"newpassword": "ಪೊಸ ಪ್ರವೇಶಪದ",
"retypenew": "ಪ್ರವೇಶಪದ ಪಿರ ಟೈಪ್ ಮಲ್ಪುಲೆ",
"resetpass_submit": "ಪ್ರವೇಶಪದ ನಿಶ್ಚಯ ಮಲ್ತ್‘ದ್ ಲಾಗ್ ಇನ್ ಆಲೆ",
"changepassword-success": "ಈರೆನ ಪಾಸ್ವರ್ಡ್ ಬದಲಾತ್ಂಡ್",
+ "changepassword-throttled": "ಈರ್ ದಿಂಜ ಸರ್ತಿ ಉಳಪ್ರವೇಶ ಪ್ರಯತ್ನ ಮಲ್ದರ್.\nದಯಮಲ್ತ್ ನನೊರ ಪ್ರಯತ್ನ ಮಲ್ಪುನ ದುಂಬು $1 ಕಾಪುಲೆ.",
"botpasswords": "ಬಾಟ್ ಪಾಸ್ವರ್ಡ್",
+ "botpasswords-summary": "<em>Bot passwords</em> ಖಾತೆದ ಮುಖ್ಯ ಉಳಗಮನ ರುಜುವಾತುಲೆನ್ ಬಳಸಂದೆ API ಮೂಲಕ ಬಳಕೆದಾರ ಖಾತೆಗ್ ಪ್ರವೇಶ ಕೊರ್ಪುಂಡು.ಬಾಟ್ ಸಂಕೇತಪದ ಮೂಲಕ ಉಳಗಮನ ಮಲ್ತಿನದಗ ಬಳಕೆದಾರೆರ ಹಕ್ಕುಲು ಮಿತವಾದುಪ್ಪು.\nಇರೆಗ್ ಉಂದೆನ್ ದಾಯೆಗ್ ಮಲ್ಪೊಡು ಇಂದ್ ಗೊತ್ತಿಜ್ಜಿಡ,ಈರ್ ಅವೆನ್ ಮಲ್ಪಂದೆ ಉಪ್ಪುನು ಎಡ್ಡೆ.ಏರ್ಲಾ ಇರೆಗ್ ಏಪಲಾ ಇಂಚಿನ ಒಂಜೆನ್ ಪುಟ್ಟಾದ್ ಅಕಲೆಗ್ ಕೊರುಲೆಂದ್ ಇರೆಗ್ ಕೇಣರೆ ಬಲ್ಲಿ.",
"botpasswords-disabled": "ಬಾಟ್ ಪಾಸ್ವರ್ಡ್ಲೆನ್ ನಿಸ್ಕ್ರೀಯೊ ಮಲ್ತಾತ್ಂಡ್",
+ "botpasswords-no-central-id": "ಬಾಟ್ ಸಂಕೇತಪದೊಲೆನ್ ಬಳಕೆ ಮಲ್ಪರೆ ಈರ್ ಒಂಜಿ ಕೇಂದ್ರಿಕೃತ ಖಾತೆಗ್ ಉಳಗಮನ ಆದಿಪ್ಪೊಡು.",
"botpasswords-existing": "ಅಸ್ತಿತ್ವೊಡು ಇದ್ಯಾಂದಿನ ಬಾಟ್ ಪಾಸ್ವರ್ಡ್",
+ "botpasswords-createnew": "ಪೊಸ ಬಾಟ್ ಸಂಕೇತಪದ ರಚಿಸಾಲೆ.",
+ "botpasswords-editexisting": "ಉಪ್ಪುನ ಒಂಜಿ ಸಂಕೇತಪದೊನು ಸಂಪಾದಾಲೆ.",
+ "botpasswords-label-needsreset": "(ಸಂಕೇತಪದ ತಿರುಜೋಡನೆ ಆವೊಡು)",
"botpasswords-label-appid": "ಬಾಟ್ ಪುದರ್",
"botpasswords-label-create": "ಸ್ರಿಸ್ಟಿಸಲೆ",
"botpasswords-label-update": "ಮಿತ್ತ್ ಏರಲೆ",
"botpasswords-label-delete": "ದೆಪ್ಪುಲೆ",
"botpasswords-label-resetpassword": "ಪ್ರವೇಸೊ ಪದೊನ್ ಪಿರ ಸ್ತಾಪನೆ ಮಲ್ಪುಲೆ",
"botpasswords-label-grants": "ಅನ್ವಯೊ ಆಪುನ ಅನುದಾನೊ",
+ "botpasswords-help-grants": "ಅನುದಾನೊಲು ಇರೆನ ಬಳಕೆದಾರೆ ಖಾತೆಡ್ ಇತ್ತೆ ಉಪ್ಪುನ ಹಕ್ಕುಲೆಗ್ ಪ್ರವೇಶ ಕೊರ್ಪುಂಡು. ಒಂಜಿ ಅನುದಾನೊನು ಮುಲ್ಪ ಸಶಕ್ತ ಮಲ್ತ್ಂಡ,ಅವು ಇತ್ತೆ ಇರೆನ ಬಳಕೆದಾರೆ ಖಾತೆಡ್ ಉಪ್ಪಂದಿನ ಹಕ್ಕುಲೆಗ್ ಪ್ರವೇಶ ಕೊರ್ಪುಜಿ.ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾದ್ \n[[Special:ListGrants|table of grants]] ತೂಲೆ.",
"botpasswords-label-grants-column": "ಅನುದಾನೊ",
+ "botpasswords-bad-appid": "ಬಾಟ್ದ ಪುದರ್ $1 ಮಾನ್ಯ ಅತ್ತ್.",
+ "botpasswords-insert-failed": "ಬಾಟ್ದ ಪುದರ್ $1 ಸೇರಾರೆ ವಿಫಲವಾಂಡ್.ಅವು ಅದಗನೇ ಸೇರ್ದುಂಡಾ?",
+ "botpasswords-update-failed": "ಬಾಟ್ದ ಪುದರ್ $1 ಕಾಲನವಿಕ ವಿಫಲವಾಂಡ್.ಅವೆನ್ ಮಾಜಾದಿಂಡಾ?",
"botpasswords-created-title": "ಬಾಟ್ ಪಾಸ್ವರ್ಡ್ನ್ ಸ್ರಿಸ್ಟಿಸದಾತ್ಂಡ್",
+ "botpasswords-created-body": "$1 ಬಾಟ್ ಪುದರ್ದ {{GENDER:$2|ಬಳಕೆದಾರೆ}}ಬಾಟ್ ಸಂಕೇತಪದ $2 ರಚನೆ ಆತ್ಂಡ್.",
"botpasswords-updated-title": "ಬಾಟ್ ಪಾಸ್ವರ್ಡ್ನ್ ಮಿತ್ತ್ ಏರ್ಪದಾತ್ಂಡ್",
+ "botpasswords-updated-body": "ಬಾಟ್ ಪುದರ್ \"$1\"ದ ಬಾಟ್ ಸಂಕೇತಪದ {{GENDER:$2|ಬಳಕೆದಾರೆ}}\"$2\" ಕಾಲನವಿ ಆತ್ಂಡ್.",
"botpasswords-deleted-title": "ಬಾಟ್ ಪಾಸ್ವರ್ಡ್ ದೆತ್ತ್ದಾತ್ಂಡ್",
+ "botpasswords-deleted-body": "ಬಾಟ್ ಪುದರ್ \"$1\"ದ ಬಾಟ್ ಸಂಕೇತಪದ {{GENDER:$2|ಬಳಕೆದಾರೆ}}\"$2\" ಮಾಜಾದುಂಡ್.",
+ "botpasswords-newpassword": "\n <strong>$1</strong> ದೊಟ್ಟುಗು ಉಳಗಮನೊಗು ಪೊಸ ಸಂಕೇತಪದ <strong>$2</strong>. <em> ದಯಮಲ್ತ್ ಉಂದೆನ್ ಭವಿಷ್ಯತ್'ದ ಉಲ್ಲೇಖೊಗಾದ್ ದಾಖಲಿಸಾಲೆ</em> <br> ( ಇರೆನ ಉಳಗಮನ ಪುದರ್ ಸಂಭಾವ್ಯ ಬಳಕೆದಾರೆ ಪುದರ್ ಸಮಾನ ಅದುಪ್ಪುನ ಪರಾತ್ ಬಾಟ್'ಲೆಗ್, ಈರ್ <strong>$3</strong> ಬಳಕೆದಾರೆ ಪುದರಾದ್ ಬೊಕ <strong>$4</strong> ಸಂಕೇತಪದವಾದ್ ಗಳಸೊಲಿ)",
+ "botpasswords-no-provider": "BotPasswordsSessionProvider ತಿಕ್ಕುಜಿ.",
+ "botpasswords-restriction-failed": "ಬಾಟ್ ಸಂಕೇತಪದ ಮಿತಿಲು ಈ ಉಳಗಮನ ತಡೆಪುಂಡು.",
+ "botpasswords-invalid-name": "ವಿಸೂಚಿತ ಬಳಕೆದಾರೆಪುದರುಡು ಬಾಟ್ ಸಂಕೇತಪದ ಪ್ರತ್ಯೇಕಿಕ $1 ಇಜ್ಜಿ.",
+ "botpasswords-not-exist": "ಬಳಕೆದಾರೆ $1 ರೆಗ್ $2 ಪುದರುದ ಒಂಜಿ ಬಾಟ್ ಸಂಕೇತ ಪದ ಇಜ್ಜಿ.",
+ "botpasswords-needs-reset": "ಬಾಟ್ ಪುದರ್ \"$1\"ದ ಬಾಟ್ ಸಂಕೇತಪದ {{GENDER:$2|ಬಳಕೆದಾರೆ}}\"$2\" ತಿರುಜೋಡನೆ ಆವೊಡು.",
+ "botpasswords-locked": "ಇರೆನ ಖಾತೆಗ್ ಬೀಗ ಪಾಡಿನ ಕಾರಣ ಈರ್ ಬಾಟ್ ಸಂಕೇತಪದೊಟು ಉಳಗಮನ ಮಲ್ಪರಾಪುಜಿ.",
+ "resetpass_forbidden": "ಸಂಕೇತಪದೊಲು ಬದಲಿಪರೆ ಆಪುಜಿ.",
+ "resetpass_forbidden-reason": "ಸಂಕೇತಪದೊಲು ಬದಲಾವರೆ ಆಪುಜಿ:$1",
+ "resetpass-no-info": "ಈ ಪುಟತ ನೇರ ಪ್ರವೇಶೊಗು ಈರ್ ಉಳಗಮನ ಆದಿಪ್ಪೊಡು.",
"resetpass-submit-loggedin": "ಪ್ರವೇಶಪದೊನ್ ಬದಲಾವಣೆ ಮಲ್ಪುಲೆ",
"resetpass-submit-cancel": "ವಜಾ ಮಲ್ಪುಲೆ",
+ "resetpass-wrong-oldpass": "ಅಮಾನ್ಯ ತಾತ್ಕಾಲಿಕ ಇಜಿಂಡ ಚಾಲ್ತಿ ಸಂಕೇತಪದ.\nಈರ್ ಇರೆನ ಸಂಕೇತಪದೊನು ಅದಗನೆ ಬದಲ್ ಮಲ್ತೊಂದರ್ ಇಜಿಂಡ ಒಂಜಿ ಪೊಸ ತಾತ್ಕಾಲಿಕ ಸಂಕೇತಪದೊಕು ಕೋರಿಕೆ ಕೊರ್ತರ್.",
+ "resetpass-recycled": "ಈರ್ ಇತ್ತೆ ಚಾಲ್ತಿ ಉಪ್ಪುನ ಸಂಕೇತಪದೊ ಅತ್ತಾಂದಿನ ಬೇತೆ ಸಂಕೇತಪದೊಕು ಬದಲು ಮಲ್ಪುಲೆ.",
"resetpass-temp-password": "ತಾತ್ಕಾಲಿಕ ಪ್ರವೇಶಪದ:",
"passwordreset": "ಪ್ರವೇಸೊ ಪದೊನ್ ಪಿರ ಸ್ತಾಪನೆ ಮಲ್ಪುಲೆ",
"passwordreset-username": "ಸದಸ್ಯೆರ್ನ ಪುದರ್:",
"wantedtemplates": "แม่แบบที่ต้องการ",
"mostlinked": "หน้าที่มีการเชื่อมโยงหามากที่สุด",
"mostlinkedcategories": "หมวดหมู่ที่มีการเชื่อมโยงหามากที่สุด",
- "mostlinkedtemplates": "หà¸\99à¹\89าà¸\97ีà¹\88มีà¸\81ารà¹\80à¸\8aืà¹\88à¸à¸¡à¹\82ยà¸\87หามากที่สุด",
+ "mostlinkedtemplates": "หà¸\99à¹\89าà¸\97ีà¹\88à¸\96ูà¸\81à¹\83à¸\8aà¹\89à¹\80à¸\9bà¹\87à¸\99à¹\81มà¹\88à¹\81à¸\9aà¸\9aมากที่สุด",
"mostcategories": "หน้าที่มีหมวดหมู่มากที่สุด",
"mostimages": "ไฟล์ที่มีการโยงหามากที่สุด",
"mostinterwikis": "หน้าที่มีลิงก์ข้ามโครงการมากที่สุด",
"grant-createaccount": "建立帳號",
"grant-createeditmovepage": "建立、編輯與移動頁面",
"grant-delete": "刪除頁面、修訂與日誌記錄",
- "grant-editinterface": "編輯 MediaWiki 命名空間與站台範圍/使用者 JSON",
+ "grant-editinterface": "編輯 MediaWiki 命名空間與全站範圍/使用者 JSON",
"grant-editmycssjs": "編輯您的使用者 CSS/JSON/JavaScript",
"grant-editmyoptions": "編輯您的使用者偏好設定以及 JSON 設置",
"grant-editmywatchlist": "編輯您的監視清單",
- "grant-editsiteconfig": "編輯站台範圍與使用者 CSS/JS",
+ "grant-editsiteconfig": "編輯全站範圍與使用者 CSS/JS",
"grant-editpage": "編輯現有的頁面",
"grant-editprotected": "編輯受保護的頁面",
"grant-highvolume": "大量編輯",
"ipb-disableusertalk": "編輯自己的對話頁面",
"ipb-change-block": "使用現有設定重新封鎖使用者",
"ipb-confirm": "確認封鎖",
- "ipb-sitewide": "站台範圍",
+ "ipb-sitewide": "全站範圍",
"ipb-partial": "部分",
"ipb-pages-label": "頁面",
"ipb-namespaces-label": "命名空間",
"emailblock": "停用電子郵件",
"blocklist-nousertalk": "無法編輯自己的對話頁面",
"blocklist-editing": "編輯",
- "blocklist-editing-sitewide": "編輯（站台範圍）",
+ "blocklist-editing-sitewide": "編輯（全站範圍）",
"blocklist-editing-page": "頁面",
"blocklist-editing-ns": "命名空間",
"ipblocklist-empty": "封鎖清單為空。",
"ipb_expiry_old": "到期時間已過。",
"ipb_expiry_temp": "隱藏使用者名稱的封鎖不可設定期限。",
"ipb_hide_invalid": "無法禁止顯示此帳號；它擁有超過 $1 次的編輯。",
+ "ipb_hide_partial": "隱藏使用者封鎖必須是全站封鎖。",
"ipb_already_blocked": "已經封鎖 \"$1\"。",
"ipb-needreblock": "$1 已經被封鎖。您是否想變更設定？",
"ipb-otherblocks-header": "其他{{PLURAL:$1|封鎖}}",
--- /dev/null
+--
+-- patch-drop-comment-fields.sql
+--
+-- T166732. Drop old xx_comment fields, and defaults from xx_comment_id fields.
+
+ALTER TABLE /*_*/archive
+ DROP COLUMN ar_comment,
+ ALTER COLUMN ar_comment_id DROP DEFAULT;
+
+ALTER TABLE /*_*/ipblocks
+ DROP COLUMN ipb_reason,
+ ALTER COLUMN ipb_reason_id DROP DEFAULT;
+
+ALTER TABLE /*_*/image
+ DROP COLUMN img_description,
+ ALTER COLUMN img_description_id DROP DEFAULT;
+
+ALTER TABLE /*_*/oldimage
+ DROP COLUMN oi_description,
+ ALTER COLUMN oi_description_id DROP DEFAULT;
+
+ALTER TABLE /*_*/filearchive
+ DROP COLUMN fa_deleted_reason,
+ ALTER COLUMN fa_deleted_reason_id DROP DEFAULT,
+ DROP COLUMN fa_description,
+ ALTER COLUMN fa_description_id DROP DEFAULT;
+
+ALTER TABLE /*_*/recentchanges
+ DROP COLUMN rc_comment,
+ ALTER COLUMN rc_comment_id DROP DEFAULT;
+
+ALTER TABLE /*_*/logging
+ DROP COLUMN log_comment,
+ ALTER COLUMN log_comment_id DROP DEFAULT;
+
+ALTER TABLE /*_*/protected_titles
+ DROP COLUMN pt_reason,
+ ALTER COLUMN pt_reason_id DROP DEFAULT;
$dbw = $this->getDB( DB_MASTER );
# Handle each entry
- // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
for ( $linenum = 1; !feof( $file ); $linenum++ ) {
$line = trim( fgets( $file ) );
if ( $line == '' ) {
}
protected function doDBUpdates() {
- global $wgCommentTableSchemaMigrationStage;
-
- if ( $wgCommentTableSchemaMigrationStage < MIGRATION_WRITE_NEW ) {
- $this->output(
- "...cannot update while \$wgCommentTableSchemaMigrationStage < MIGRATION_WRITE_NEW\n"
- );
- return false;
- }
-
$this->migrateToTemp(
'revision', 'rev_id', 'rev_comment', 'revcomment_rev', 'revcomment_comment_id'
);
* @param string $oldField Old comment field name
*/
protected function migrate( $table, $primaryKey, $oldField ) {
+ $dbw = $this->getDB( DB_MASTER );
+ if ( !$dbw->fieldExists( $table, $oldField, __METHOD__ ) ) {
+ $this->output( "No need to migrate $table.$oldField, field does not exist\n" );
+ return;
+ }
+
$newField = $oldField . '_id';
$primaryKey = (array)$primaryKey;
$pkFilter = array_flip( $primaryKey );
$this->output( "Beginning migration of $table.$oldField to $table.$newField\n" );
wfWaitForSlaves();
- $dbw = $this->getDB( DB_MASTER );
$next = '1=1';
$countUpdated = 0;
$countComments = 0;
* @param string $newField New comment field name
*/
protected function migrateToTemp( $table, $primaryKey, $oldField, $newPrimaryKey, $newField ) {
+ $dbw = $this->getDB( DB_MASTER );
+ if ( !$dbw->fieldExists( $table, $oldField, __METHOD__ ) ) {
+ $this->output( "No need to migrate $table.$oldField, field does not exist\n" );
+ return;
+ }
+
$newTable = $table . '_comment_temp';
$this->output( "Beginning migration of $table.$oldField to $newTable.$newField\n" );
wfWaitForSlaves();
# Setup complete, now start
$dbw = $this->getDB( DB_MASTER );
- // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
for ( $linenum = 1; !feof( $file ); $linenum++ ) {
$line = fgets( $file );
if ( $line === false ) {
--- /dev/null
+--
+-- patch-drop-comment-fields.sql
+--
+-- T166732. Drop old xx_comment fields, and defaults from xx_comment_id fields.
+
+DECLARE @sql nvarchar(max),
+ @id sysname;
+
+ALTER TABLE /*_*/archive DROP CONSTRAINT DF_ar_comment, COLUMN ar_comment;
+ALTER TABLE /*_*/archive DROP CONSTRAINT DF_ar_comment_id;
+
+ALTER TABLE /*_*/ipblocks DROP CONSTRAINT DF_ipb_reason, COLUMN ipb_reason;
+ALTER TABLE /*_*/ipblocks DROP CONSTRAINT DF_ipb_reason_id;
+
+ALTER TABLE /*_*/image DROP CONSTRAINT DF_img_description, COLUMN img_description;
+ALTER TABLE /*_*/image DROP CONSTRAINT DF_img_description_id;
+
+ALTER TABLE /*_*/oldimage DROP CONSTRAINT DF_oi_description, COLUMN oi_description;
+ALTER TABLE /*_*/oldimage DROP CONSTRAINT DF_oi_description_id;
+
+ALTER TABLE /*_*/filearchive DROP CONSTRAINT DF_fa_deleted_reason, COLUMN fa_deleted_reason;
+ALTER TABLE /*_*/filearchive DROP CONSTRAINT DF_fa_deleted_reason_id;
+ALTER TABLE /*_*/filearchive DROP CONSTRAINT DF_fa_description, COLUMN fa_description;
+ALTER TABLE /*_*/filearchive DROP CONSTRAINT DF_fa_description_id;
+
+SET @sql = 'ALTER TABLE /*_*/recentchanges DROP CONSTRAINT ';
+SELECT @id = df.name
+FROM sys.default_constraints df
+JOIN sys.columns c
+ ON c.object_id = df.parent_object_id
+ AND c.column_id = df.parent_column_id
+WHERE
+ df.parent_object_id = OBJECT_ID('/*_*/recentchanges')
+ AND c.name = 'rc_comment';
+SET @sql = @sql + @id;
+EXEC sp_executesql @sql;
+ALTER TABLE /*_*/recentchanges DROP COLUMN rc_comment;
+ALTER TABLE /*_*/recentchanges DROP CONSTRAINT DF_rc_comment_id;
+
+SET @sql = 'ALTER TABLE /*_*/logging DROP CONSTRAINT ';
+SELECT @id = df.name
+FROM sys.default_constraints df
+JOIN sys.columns c
+ ON c.object_id = df.parent_object_id
+ AND c.column_id = df.parent_column_id
+WHERE
+ df.parent_object_id = OBJECT_ID('/*_*/logging')
+ AND c.name = 'log_comment';
+SET @sql = @sql + @id;
+EXEC sp_executesql @sql;
+ALTER TABLE /*_*/logging DROP COLUMN log_comment;
+ALTER TABLE /*_*/logging DROP CONSTRAINT DF_log_comment_id;
+
+ALTER TABLE /*_*/protected_titles DROP CONSTRAINT DF_pt_reason, COLUMN pt_reason;
+ALTER TABLE /*_*/protected_titles DROP CONSTRAINT DF_pt_reason_id;
ar_id int NOT NULL PRIMARY KEY IDENTITY,
ar_namespace SMALLINT NOT NULL DEFAULT 0,
ar_title NVARCHAR(255) NOT NULL DEFAULT '',
- ar_comment NVARCHAR(255) NOT NULL CONSTRAINT DF_ar_comment DEFAULT '',
- ar_comment_id bigint NOT NULL CONSTRAINT DF_ar_comment_id DEFAULT 0 CONSTRAINT FK_ar_comment_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
+ ar_comment_id bigint NOT NULL CONSTRAINT FK_ar_comment_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
ar_user INT CONSTRAINT ar_user__user_id__fk FOREIGN KEY REFERENCES /*_*/mwuser(user_id),
ar_user_text NVARCHAR(255) NOT NULL CONSTRAINT DF_ar_user_text DEFAULT '',
ar_actor bigint NOT NULL CONSTRAINT DF_ar_actor DEFAULT 0,
-- User name of blocker
ipb_by_text nvarchar(255) NOT NULL default '',
- -- Text comment made by blocker.
- ipb_reason nvarchar(255) NOT NULL CONSTRAINT DF_ipb_reason DEFAULT '',
-
-- Key to comment_id. Text comment made by blocker.
- -- ("DEFAULT 0" is temporary, signaling that ipb_reason should be used)
- ipb_reason_id bigint NOT NULL CONSTRAINT DF_ipb_reason_id DEFAULT 0 CONSTRAINT FK_ipb_reason_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
+ ipb_reason_id bigint NOT NULL CONSTRAINT FK_ipb_reason_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
-- Creation (or refresh) date in standard YMDHMS form.
-- IP blocks expire automatically.
-- Description field as entered by the uploader.
-- This is displayed in image upload history and logs.
- img_description nvarchar(255) NOT NULL CONSTRAINT DF_img_description DEFAULT '',
- img_description_id bigint NOT NULL CONSTRAINT DF_img_description_id DEFAULT 0 CONSTRAINT FK_img_description_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
+ img_description_id bigint NOT NULL CONSTRAINT FK_img_description_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
-- user_id and user_name of uploader.
img_user int REFERENCES /*_*/mwuser(user_id) ON DELETE SET NULL,
oi_width int NOT NULL default 0,
oi_height int NOT NULL default 0,
oi_bits int NOT NULL default 0,
- oi_description nvarchar(255) NOT NULL CONSTRAINT DF_oi_description DEFAULT '',
- oi_description_id bigint NOT NULL CONSTRAINT DF_oi_description_id DEFAULT 0 CONSTRAINT FK_oi_description_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
+ oi_description_id bigint NOT NULL CONSTRAINT FK_oi_description_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
oi_user int REFERENCES /*_*/mwuser(user_id),
oi_user_text nvarchar(255) NOT NULL CONSTRAINT DF_oi_user_text DEFAULT '',
oi_actor bigint NOT NULL CONSTRAINT DF_oi_actor DEFAULT 0,
-- Deletion information, if this file is deleted.
fa_deleted_user int,
fa_deleted_timestamp varchar(14) default '',
- fa_deleted_reason nvarchar(max) CONSTRAINT DF_fa_deleted_reason DEFAULT '',
- fa_deleted_reason_id bigint NOT NULL CONSTRAINT DF_fa_deleted_reason_id DEFAULT 0 CONSTRAINT FK_fa_deleted_reason_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
+ fa_deleted_reason_id bigint NOT NULL CONSTRAINT FK_fa_deleted_reason_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
-- Duped fields from image
fa_size int default 0,
fa_media_type varchar(16) default null,
fa_major_mime varchar(16) not null default 'unknown',
fa_minor_mime nvarchar(100) default 'unknown',
- fa_description nvarchar(255) CONSTRAINT DF_fa_description DEFAULT '',
- fa_description_id bigint NOT NULL CONSTRAINT DF_fa_description_id DEFAULT 0 CONSTRAINT FK_fa_description_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
+ fa_description_id bigint NOT NULL CONSTRAINT FK_fa_description_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
fa_user int default 0 REFERENCES /*_*/mwuser(user_id) ON DELETE SET NULL,
fa_user_text nvarchar(255) CONSTRAINT DF_fa_user_text DEFAULT '',
fa_actor bigint NOT NULL CONSTRAINT DF_fa_actor DEFAULT 0,
rc_title nvarchar(255) NOT NULL default '',
-- as in revision...
- rc_comment nvarchar(255) NOT NULL default '',
- rc_comment_id bigint NOT NULL CONSTRAINT DF_rc_comment_id DEFAULT 0 CONSTRAINT FK_rc_comment_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
+ rc_comment_id bigint NOT NULL CONSTRAINT FK_rc_comment_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
rc_minor bit NOT NULL default 0,
-- Edits by user accounts with the 'bot' rights key are
log_title nvarchar(255) NOT NULL default '',
log_page int NULL, -- NOT an FK, logging entries are inserted for deleted pages which still reference the deleted page ids
- -- Freeform text. Interpreted as edit history comments.
- log_comment nvarchar(255) NOT NULL default '',
-
-- Key to comment_id. Comment summarizing the change.
- -- ("DEFAULT 0" is temporary, signaling that log_comment should be used)
- log_comment_id bigint NOT NULL CONSTRAINT DF_log_comment_id DEFAULT 0 CONSTRAINT FK_log_comment_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
+ log_comment_id bigint NOT NULL CONSTRAINT FK_log_comment_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
-- miscellaneous parameters:
-- LF separated list (old system) or serialized PHP array (new system)
pt_namespace int NOT NULL,
pt_title nvarchar(255) NOT NULL,
pt_user int REFERENCES /*_*/mwuser(user_id) ON DELETE SET NULL,
- pt_reason nvarchar(255) CONSTRAINT DF_pt_reason DEFAULT '',
- pt_reason_id bigint NOT NULL CONSTRAINT DF_pt_reason_id DEFAULT 0 CONSTRAINT FK_pt_reason_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
+ pt_reason_id bigint NOT NULL CONSTRAINT FK_pt_reason_id FOREIGN KEY REFERENCES /*_*/comment(comment_id),
pt_timestamp varchar(14) NOT NULL,
pt_expiry varchar(14) NOT NULL,
pt_create_perm nvarchar(60) NOT NULL,
--- /dev/null
+--
+-- patch-drop-comment-fields.sql
+--
+-- T166732. Drop old xx_comment fields, and defaults from xx_comment_id fields.
+
+ALTER TABLE &mw_prefix.archive DROP COLUMN ar_comment;
+ALTER TABLE &mw_prefix.archive MODIFY ar_comment_id DEFAULT NULL;
+
+ALTER TABLE &mw_prefix.ipblocks DROP COLUMN ipb_reason;
+ALTER TABLE &mw_prefix.ipblocks MODIFY ipb_reason_id DEFAULT NULL;
+
+ALTER TABLE &mw_prefix.image DROP COLUMN img_description;
+ALTER TABLE &mw_prefix.image MODIFY img_description_id DEFAULT NULL;
+
+ALTER TABLE &mw_prefix.oldimage DROP COLUMN oi_description;
+ALTER TABLE &mw_prefix.oldimage MODIFY oi_description_id DEFAULT NULL;
+
+ALTER TABLE &mw_prefix.filearchive DROP COLUMN fa_deleted_reason;
+ALTER TABLE &mw_prefix.filearchive MODIFY fa_deleted_reason_id DEFAULT NULL,
+ALTER TABLE &mw_prefix.filearchive DROP COLUMN fa_description;
+ALTER TABLE &mw_prefix.filearchive MODIFY fa_description_id DEFAULT NULL;
+
+ALTER TABLE &mw_prefix.recentchanges DROP COLUMN rc_comment;
+ALTER TABLE &mw_prefix.recentchanges MODIFY rc_comment_id DEFAULT NULL;
+
+ALTER TABLE &mw_prefix.logging DROP COLUMN log_comment;
+ALTER TABLE &mw_prefix.logging MODIFY log_comment_id DEFAULT NULL;
+
+ALTER TABLE &mw_prefix.protected_titles DROP COLUMN pt_reason;
+ALTER TABLE &mw_prefix.protected_titles MODIFY pt_reason_id DEFAULT NULL;
ar_id NUMBER NOT NULL,
ar_namespace NUMBER DEFAULT 0 NOT NULL,
ar_title VARCHAR2(255) NOT NULL,
- ar_comment VARCHAR2(255),
- ar_comment_id NUMBER DEFAULT 0 NOT NULL,
+ ar_comment_id NUMBER NOT NULL,
ar_user NUMBER DEFAULT 0 NOT NULL,
ar_user_text VARCHAR2(255) NULL,
ar_actor NUMBER DEFAULT 0 NOT NULL,
ipb_by NUMBER DEFAULT 0 NOT NULL,
ipb_by_text VARCHAR2(255) NULL,
ipb_by_actor NUMBER DEFAULT 0 NOT NULL,
- ipb_reason VARCHAR2(255) NULL,
- ipb_reason_id NUMBER DEFAULT 0 NOT NULL,
+ ipb_reason_id NUMBER NOT NULL,
ipb_timestamp TIMESTAMP(6) WITH TIME ZONE NOT NULL,
ipb_auto CHAR(1) DEFAULT '0' NOT NULL,
ipb_anon_only CHAR(1) DEFAULT '0' NOT NULL,
img_media_type VARCHAR2(32),
img_major_mime VARCHAR2(32) DEFAULT 'unknown',
img_minor_mime VARCHAR2(100) DEFAULT 'unknown',
- img_description VARCHAR2(255),
- img_description_id NUMBER DEFAULT 0 NOT NULL,
+ img_description_id NUMBER NOT NULL,
img_user NUMBER DEFAULT 0 NOT NULL,
img_user_text VARCHAR2(255) NULL,
img_actor NUMBER DEFAULT 0 NOT NULL,
oi_width NUMBER DEFAULT 0 NOT NULL,
oi_height NUMBER DEFAULT 0 NOT NULL,
oi_bits NUMBER DEFAULT 0 NOT NULL,
- oi_description VARCHAR2(255),
- oi_description_id NUMBER DEFAULT 0 NOT NULL,
+ oi_description_id NUMBER NOT NULL,
oi_user NUMBER DEFAULT 0 NOT NULL,
oi_user_text VARCHAR2(255) NULL,
oi_actor NUMBER DEFAULT 0 NOT NULL,
fa_storage_key VARCHAR2(64),
fa_deleted_user NUMBER DEFAULT 0 NOT NULL,
fa_deleted_timestamp TIMESTAMP(6) WITH TIME ZONE NOT NULL,
- fa_deleted_reason CLOB,
- fa_deleted_reason_id NUMBER DEFAULT 0 NOT NULL,
+ fa_deleted_reason_id NUMBER NOT NULL,
fa_size NUMBER DEFAULT 0 NOT NULL,
fa_width NUMBER DEFAULT 0 NOT NULL,
fa_height NUMBER DEFAULT 0 NOT NULL,
fa_media_type VARCHAR2(32) DEFAULT NULL,
fa_major_mime VARCHAR2(32) DEFAULT 'unknown',
fa_minor_mime VARCHAR2(100) DEFAULT 'unknown',
- fa_description VARCHAR2(255),
- fa_description_id NUMBER DEFAULT 0 NOT NULL,
+ fa_description_id NUMBER NOT NULL,
fa_user NUMBER DEFAULT 0 NOT NULL,
fa_user_text VARCHAR2(255) NULL,
fa_actor NUMBER DEFAULT 0 NOT NULL,
rc_actor NUMBER DEFAULT 0 NOT NULL,
rc_namespace NUMBER DEFAULT 0 NOT NULL,
rc_title VARCHAR2(255) NOT NULL,
- rc_comment VARCHAR2(255),
- rc_comment_id NUMBER DEFAULT 0 NOT NULL,
+ rc_comment_id NUMBER NOT NULL,
rc_minor CHAR(1) DEFAULT '0' NOT NULL,
rc_bot CHAR(1) DEFAULT '0' NOT NULL,
rc_new CHAR(1) DEFAULT '0' NOT NULL,
log_namespace NUMBER DEFAULT 0 NOT NULL,
log_title VARCHAR2(255) NOT NULL,
log_page NUMBER,
- log_comment VARCHAR2(255),
- log_comment_id NUMBER DEFAULT 0 NOT NULL,
+ log_comment_id NUMBER NOT NULL,
log_params CLOB,
log_deleted CHAR(1) DEFAULT '0' NOT NULL
);
pt_namespace NUMBER DEFAULT 0 NOT NULL,
pt_title VARCHAR2(255) NOT NULL,
pt_user NUMBER NOT NULL,
- pt_reason VARCHAR2(255),
- pt_reason_id NUMBER DEFAULT 0 NOT NULL,
+ pt_reason_id NUMBER NOT NULL,
pt_timestamp TIMESTAMP(6) WITH TIME ZONE NOT NULL,
pt_expiry VARCHAR2(14) NOT NULL,
pt_create_perm VARCHAR2(60) NOT NULL
ar_page_id INTEGER NULL,
ar_parent_id INTEGER NULL,
ar_sha1 TEXT NOT NULL DEFAULT '',
- ar_comment TEXT NOT NULL DEFAULT '',
- ar_comment_id INTEGER NOT NULL DEFAULT 0,
+ ar_comment_id INTEGER NOT NULL,
ar_user INTEGER NOT NULL DEFAULT 0 REFERENCES mwuser(user_id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
ar_user_text TEXT NOT NULL DEFAULT '',
ar_actor INTEGER NOT NULL DEFAULT 0,
ipb_by INTEGER NOT NULL DEFAULT 0 REFERENCES mwuser(user_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
ipb_by_text TEXT NOT NULL DEFAULT '',
ipb_by_actor INTEGER NOT NULL DEFAULT 0,
- ipb_reason TEXT NOT NULL DEFAULT '',
- ipb_reason_id INTEGER NOT NULL DEFAULT 0,
+ ipb_reason_id INTEGER NOT NULL,
ipb_timestamp TIMESTAMPTZ NOT NULL,
ipb_auto SMALLINT NOT NULL DEFAULT 0,
ipb_anon_only SMALLINT NOT NULL DEFAULT 0,
img_media_type TEXT,
img_major_mime TEXT DEFAULT 'unknown',
img_minor_mime TEXT DEFAULT 'unknown',
- img_description TEXT NOT NULL DEFAULT '',
- img_description_id INTEGER NOT NULL DEFAULT 0,
+ img_description_id INTEGER NOT NULL,
img_user INTEGER NOT NULL DEFAULT 0 REFERENCES mwuser(user_id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
img_user_text TEXT NOT NULL DEFAULT '',
img_actor INTEGER NOT NULL DEFAULT 0,
oi_width INTEGER NOT NULL,
oi_height INTEGER NOT NULL,
oi_bits SMALLINT NULL,
- oi_description TEXT NOT NULL DEFAULT '',
- oi_description_id INTEGER NOT NULL DEFAULT 0,
+ oi_description_id INTEGER NOT NULL,
oi_user INTEGER NOT NULL DEFAULT 0 REFERENCES mwuser(user_id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
oi_user_text TEXT NOT NULL DEFAULT '',
oi_actor INTEGER NOT NULL DEFAULT 0,
fa_storage_key TEXT,
fa_deleted_user INTEGER NULL REFERENCES mwuser(user_id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
fa_deleted_timestamp TIMESTAMPTZ NOT NULL,
- fa_deleted_reason TEXT NOT NULL DEFAULT '',
- fa_deleted_reason_id INTEGER NOT NULL DEFAULT 0,
+ fa_deleted_reason_id INTEGER NOT NULL,
fa_size INTEGER NOT NULL,
fa_width INTEGER NOT NULL,
fa_height INTEGER NOT NULL,
fa_media_type TEXT,
fa_major_mime TEXT DEFAULT 'unknown',
fa_minor_mime TEXT DEFAULT 'unknown',
- fa_description TEXT NOT NULL DEFAULT '',
- fa_description_id INTEGER NOT NULL DEFAULT 0,
+ fa_description_id INTEGER NOT NULL,
fa_user INTEGER NOT NULL DEFAULT 0 REFERENCES mwuser(user_id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
fa_user_text TEXT NOT NULL DEFAULT '',
fa_actor INTEGER NOT NULL DEFAULT 0,
rc_actor INTEGER NOT NULL DEFAULT 0,
rc_namespace SMALLINT NOT NULL,
rc_title TEXT NOT NULL,
- rc_comment TEXT NOT NULL DEFAULT '',
- rc_comment_id INTEGER NOT NULL DEFAULT 0,
+ rc_comment_id INTEGER NOT NULL,
rc_minor SMALLINT NOT NULL DEFAULT 0,
rc_bot SMALLINT NOT NULL DEFAULT 0,
rc_new SMALLINT NOT NULL DEFAULT 0,
log_actor INTEGER NOT NULL DEFAULT 0,
log_namespace SMALLINT NOT NULL,
log_title TEXT NOT NULL,
- log_comment TEXT NOT NULL DEFAULT '',
- log_comment_id INTEGER NOT NULL DEFAULT 0,
+ log_comment_id INTEGER NOT NULL,
log_params TEXT,
log_deleted SMALLINT NOT NULL DEFAULT 0,
log_user_text TEXT NOT NULL DEFAULT '',
pt_namespace SMALLINT NOT NULL,
pt_title TEXT NOT NULL,
pt_user INTEGER NULL REFERENCES mwuser(user_id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
- pt_reason TEXT NOT NULL DEFAULT '',
- pt_reason_id INTEGER NOT NULL DEFAULT 0,
+ pt_reason_id INTEGER NOT NULL,
pt_timestamp TIMESTAMPTZ NOT NULL,
pt_expiry TIMESTAMPTZ NULL,
pt_create_perm TEXT NOT NULL DEFAULT '',
--- /dev/null
+--
+-- patch-archive-drop-ar_comment.sql
+--
+-- T166732. Drop old xx_comment fields, and defaults from xx_comment_id fields.
+
+BEGIN;
+
+DROP TABLE IF EXISTS /*_*/archive_tmp;
+CREATE TABLE /*_*/archive_tmp (
+ ar_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ ar_namespace int NOT NULL default 0,
+ ar_title varchar(255) binary NOT NULL default '',
+ ar_comment_id bigint unsigned NOT NULL,
+ ar_user int unsigned NOT NULL default 0,
+ ar_user_text varchar(255) binary NOT NULL DEFAULT '',
+ ar_actor bigint unsigned NOT NULL DEFAULT 0,
+ ar_timestamp binary(14) NOT NULL default '',
+ ar_minor_edit tinyint NOT NULL default 0,
+ ar_rev_id int unsigned NOT NULL,
+ ar_text_id int unsigned NOT NULL DEFAULT 0,
+ ar_deleted tinyint unsigned NOT NULL default 0,
+ ar_len int unsigned,
+ ar_page_id int unsigned,
+ ar_parent_id int unsigned default NULL,
+ ar_sha1 varbinary(32) NOT NULL default '',
+ ar_content_model varbinary(32) DEFAULT NULL,
+ ar_content_format varbinary(64) DEFAULT NULL
+) /*$wgDBTableOptions*/;
+
+INSERT OR IGNORE INTO /*_*/archive_tmp (
+ ar_id, ar_namespace, ar_title, ar_comment_id, ar_user, ar_user_text, ar_actor,
+ ar_timestamp, ar_minor_edit, ar_rev_id, ar_text_id, ar_deleted,
+ ar_len, ar_page_id, ar_parent_id, ar_sha1, ar_content_model, ar_content_format
+ ) SELECT
+ ar_id, ar_namespace, ar_title, ar_comment_id, ar_user, ar_user_text, ar_actor,
+ ar_timestamp, ar_minor_edit, ar_rev_id, ar_text_id, ar_deleted,
+ ar_len, ar_page_id, ar_parent_id, ar_sha1, ar_content_model, ar_content_format
+ FROM /*_*/archive;
+
+DROP TABLE /*_*/archive;
+ALTER TABLE /*_*/archive_tmp RENAME TO /*_*/archive;
+CREATE INDEX /*i*/name_title_timestamp ON /*_*/archive (ar_namespace,ar_title,ar_timestamp);
+CREATE INDEX /*i*/ar_usertext_timestamp ON /*_*/archive (ar_user_text,ar_timestamp);
+CREATE INDEX /*i*/ar_actor_timestamp ON /*_*/archive (ar_actor,ar_timestamp);
+CREATE UNIQUE INDEX /*i*/ar_revid_uniq ON /*_*/archive (ar_rev_id);
+
+COMMIT;
--- /dev/null
+--
+-- patch-filearchive-drop-fa_description.sql
+--
+-- T166732. Drop old xx_comment fields, and defaults from xx_comment_id fields.
+
+BEGIN;
+
+DROP TABLE IF EXISTS /*_*/filearchive_tmp;
+CREATE TABLE /*_*/filearchive_tmp (
+ fa_id int NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ fa_name varchar(255) binary NOT NULL default '',
+ fa_archive_name varchar(255) binary default '',
+ fa_storage_group varbinary(16),
+ fa_storage_key varbinary(64) default '',
+ fa_deleted_user int,
+ fa_deleted_timestamp binary(14) default '',
+ fa_deleted_reason_id bigint unsigned NOT NULL,
+ fa_size int unsigned default 0,
+ fa_width int default 0,
+ fa_height int default 0,
+ fa_metadata mediumblob,
+ fa_bits int default 0,
+ fa_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE", "3D") default NULL,
+ fa_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart", "chemical") default "unknown",
+ fa_minor_mime varbinary(100) default "unknown",
+ fa_description_id bigint unsigned NOT NULL,
+ fa_user int unsigned default 0,
+ fa_user_text varchar(255) binary DEFAULT '',
+ fa_actor bigint unsigned NOT NULL DEFAULT 0,
+ fa_timestamp binary(14) default '',
+ fa_deleted tinyint unsigned NOT NULL default 0,
+ fa_sha1 varbinary(32) NOT NULL default ''
+) /*$wgDBTableOptions*/;
+
+INSERT OR IGNORE INTO /*_*/filearchive_tmp (
+ fa_id, fa_name, fa_archive_name, fa_storage_group, fa_storage_key,
+ fa_deleted_user, fa_deleted_timestamp, fa_deleted_reason_id,
+ fa_size, fa_width, fa_height, fa_metadata, fa_bits,
+ fa_media_type, fa_major_mime, fa_minor_mime, fa_description_id,
+ fa_user, fa_user_text, fa_actor, fa_timestamp, fa_deleted, fa_sha1
+ ) SELECT
+ fa_id, fa_name, fa_archive_name, fa_storage_group, fa_storage_key,
+ fa_deleted_user, fa_deleted_timestamp, fa_deleted_reason_id,
+ fa_size, fa_width, fa_height, fa_metadata, fa_bits,
+ fa_media_type, fa_major_mime, fa_minor_mime, fa_description_id,
+ fa_user, fa_user_text, fa_actor, fa_timestamp, fa_deleted, fa_sha1
+ FROM /*_*/filearchive;
+
+DROP TABLE /*_*/filearchive;
+ALTER TABLE /*_*/filearchive_tmp RENAME TO /*_*/filearchive;
+CREATE INDEX /*i*/fa_name ON /*_*/filearchive (fa_name, fa_timestamp);
+CREATE INDEX /*i*/fa_storage_group ON /*_*/filearchive (fa_storage_group, fa_storage_key);
+CREATE INDEX /*i*/fa_deleted_timestamp ON /*_*/filearchive (fa_deleted_timestamp);
+CREATE INDEX /*i*/fa_user_timestamp ON /*_*/filearchive (fa_user_text,fa_timestamp);
+CREATE INDEX /*i*/fa_actor_timestamp ON /*_*/filearchive (fa_actor,fa_timestamp);
+CREATE INDEX /*i*/fa_sha1 ON /*_*/filearchive (fa_sha1(10));
+
+COMMIT;
--- /dev/null
+--
+-- patch-image-drop-img_description.sql
+--
+-- T166732. Drop old xx_comment fields, and defaults from xx_comment_id fields.
+
+BEGIN;
+
+DROP TABLE IF EXISTS /*_*/image_tmp;
+CREATE TABLE /*_*/image_tmp (
+ img_name varchar(255) binary NOT NULL default '' PRIMARY KEY,
+ img_size int unsigned NOT NULL default 0,
+ img_width int NOT NULL default 0,
+ img_height int NOT NULL default 0,
+ img_metadata mediumblob NOT NULL,
+ img_bits int NOT NULL default 0,
+ img_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE", "3D") default NULL,
+ img_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart", "chemical") NOT NULL default "unknown",
+ img_minor_mime varbinary(100) NOT NULL default "unknown",
+ img_description_id bigint unsigned NOT NULL,
+ img_user int unsigned NOT NULL default 0,
+ img_user_text varchar(255) binary NOT NULL DEFAULT '',
+ img_actor bigint unsigned NOT NULL DEFAULT 0,
+ img_timestamp varbinary(14) NOT NULL default '',
+ img_sha1 varbinary(32) NOT NULL default ''
+) /*$wgDBTableOptions*/;
+
+INSERT OR IGNORE INTO /*_*/image_tmp (
+ img_name, img_size, img_width, img_height, img_metadata, img_bits,
+ img_media_type, img_major_mime, img_minor_mime, img_description_id, img_user,
+ img_user_text, img_actor, img_timestamp, img_sha1
+ ) SELECT
+ img_name, img_size, img_width, img_height, img_metadata, img_bits,
+ img_media_type, img_major_mime, img_minor_mime, img_description_id, img_user,
+ img_user_text, img_actor, img_timestamp, img_sha1
+ FROM /*_*/image;
+
+DROP TABLE /*_*/image;
+ALTER TABLE /*_*/image_tmp RENAME TO /*_*/image;
+CREATE INDEX /*i*/img_user_timestamp ON /*_*/image (img_user,img_timestamp);
+CREATE INDEX /*i*/img_usertext_timestamp ON /*_*/image (img_user_text,img_timestamp);
+CREATE INDEX /*i*/img_actor_timestamp ON /*_*/image (img_actor,img_timestamp);
+CREATE INDEX /*i*/img_size ON /*_*/image (img_size);
+CREATE INDEX /*i*/img_timestamp ON /*_*/image (img_timestamp);
+CREATE INDEX /*i*/img_sha1 ON /*_*/image (img_sha1(10));
+CREATE INDEX /*i*/img_media_mime ON /*_*/image (img_media_type,img_major_mime,img_minor_mime);
+
+COMMIT;
--- /dev/null
+--
+-- patch-ipblocks-drop-ipb_reason.sql
+--
+-- T166732. Drop old xx_comment fields, and defaults from xx_comment_id fields.
+
+BEGIN;
+
+DROP TABLE IF EXISTS ipblocks_tmp;
+CREATE TABLE /*_*/ipblocks_tmp (
+ ipb_id int NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ ipb_address tinyblob NOT NULL,
+ ipb_user int unsigned NOT NULL default 0,
+ ipb_by int unsigned NOT NULL default 0,
+ ipb_by_text varchar(255) binary NOT NULL default '',
+ ipb_by_actor bigint unsigned NOT NULL DEFAULT 0,
+ ipb_reason_id bigint unsigned NOT NULL,
+ ipb_timestamp binary(14) NOT NULL default '',
+ ipb_auto bool NOT NULL default 0,
+ ipb_anon_only bool NOT NULL default 0,
+ ipb_create_account bool NOT NULL default 1,
+ ipb_enable_autoblock bool NOT NULL default '1',
+ ipb_expiry varbinary(14) NOT NULL default '',
+ ipb_range_start tinyblob NOT NULL,
+ ipb_range_end tinyblob NOT NULL,
+ ipb_deleted bool NOT NULL default 0,
+ ipb_block_email bool NOT NULL default 0,
+ ipb_allow_usertalk bool NOT NULL default 0,
+ ipb_parent_block_id int default NULL,
+ ipb_sitewide bool NOT NULL default 1
+) /*$wgDBTableOptions*/;
+
+INSERT OR IGNORE INTO /*_*/ipblocks_tmp (
+ ipb_id, ipb_address, ipb_user, ipb_by, ipb_by_text, ipb_by_actor, ipb_reason_id,
+ ipb_timestamp, ipb_auto, ipb_anon_only, ipb_create_account,
+ ipb_enable_autoblock, ipb_expiry, ipb_range_start, ipb_range_end,
+ ipb_deleted, ipb_block_email, ipb_allow_usertalk, ipb_parent_block_id, ipb_sitewide
+ ) SELECT
+ ipb_id, ipb_address, ipb_user, ipb_by, ipb_by_text, ipb_by_actor, ipb_reason_id,
+ ipb_timestamp, ipb_auto, ipb_anon_only, ipb_create_account,
+ ipb_enable_autoblock, ipb_expiry, ipb_range_start, ipb_range_end,
+ ipb_deleted, ipb_block_email, ipb_allow_usertalk, ipb_parent_block_id, ipb_sitewide
+ FROM /*_*/ipblocks;
+
+DROP TABLE /*_*/ipblocks;
+ALTER TABLE /*_*/ipblocks_tmp RENAME TO /*_*/ipblocks;
+CREATE UNIQUE INDEX /*i*/ipb_address ON /*_*/ipblocks (ipb_address(255), ipb_user, ipb_auto, ipb_anon_only);
+CREATE INDEX /*i*/ipb_user ON /*_*/ipblocks (ipb_user);
+CREATE INDEX /*i*/ipb_range ON /*_*/ipblocks (ipb_range_start(8), ipb_range_end(8));
+CREATE INDEX /*i*/ipb_timestamp ON /*_*/ipblocks (ipb_timestamp);
+CREATE INDEX /*i*/ipb_expiry ON /*_*/ipblocks (ipb_expiry);
+CREATE INDEX /*i*/ipb_parent_block_id ON /*_*/ipblocks (ipb_parent_block_id);
+
+COMMIT;
--- /dev/null
+--
+-- patch-logging-drop-log_comment.sql
+--
+-- T166732. Drop old xx_comment fields, and defaults from xx_comment_id fields.
+
+BEGIN;
+
+DROP TABLE IF EXISTS /*_*/logging_tmp;
+CREATE TABLE /*_*/logging_tmp (
+ log_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ log_type varbinary(32) NOT NULL default '',
+ log_action varbinary(32) NOT NULL default '',
+ log_timestamp binary(14) NOT NULL default '19700101000000',
+ log_user int unsigned NOT NULL default 0,
+ log_user_text varchar(255) binary NOT NULL default '',
+ log_actor bigint unsigned NOT NULL DEFAULT 0,
+ log_namespace int NOT NULL default 0,
+ log_title varchar(255) binary NOT NULL default '',
+ log_page int unsigned NULL,
+ log_comment_id bigint unsigned NOT NULL,
+ log_params blob NOT NULL,
+ log_deleted tinyint unsigned NOT NULL default 0
+) /*$wgDBTableOptions*/;
+
+INSERT OR IGNORE INTO /*_*/logging_tmp (
+ log_id, log_type, log_action, log_timestamp, log_user, log_user_text, log_actor,
+ log_namespace, log_title, log_page, log_comment_id, log_params, log_deleted
+ ) SELECT
+ log_id, log_type, log_action, log_timestamp, log_user, log_user_text, log_actor,
+ log_namespace, log_title, log_page, log_comment_id, log_params, log_deleted
+ FROM /*_*/logging;
+
+DROP TABLE /*_*/logging;
+ALTER TABLE /*_*/logging_tmp RENAME TO /*_*/logging;
+CREATE INDEX /*i*/type_time ON /*_*/logging (log_type, log_timestamp);
+CREATE INDEX /*i*/user_time ON /*_*/logging (log_user, log_timestamp);
+CREATE INDEX /*i*/actor_time ON /*_*/logging (log_actor, log_timestamp);
+CREATE INDEX /*i*/page_time ON /*_*/logging (log_namespace, log_title, log_timestamp);
+CREATE INDEX /*i*/times ON /*_*/logging (log_timestamp);
+CREATE INDEX /*i*/log_user_type_time ON /*_*/logging (log_user, log_type, log_timestamp);
+CREATE INDEX /*i*/log_actor_type_time ON /*_*/logging (log_actor, log_type, log_timestamp);
+CREATE INDEX /*i*/log_page_id_time ON /*_*/logging (log_page,log_timestamp);
+CREATE INDEX /*i*/log_type_action ON /*_*/logging (log_type, log_action, log_timestamp);
+CREATE INDEX /*i*/log_user_text_type_time ON /*_*/logging (log_user_text, log_type, log_timestamp);
+CREATE INDEX /*i*/log_user_text_time ON /*_*/logging (log_user_text, log_timestamp);
+
+COMMIT;
--- /dev/null
+--
+-- patch-oldimage-drop-oi_description.sql
+--
+-- T166732. Drop old xx_comment fields, and defaults from xx_comment_id fields.
+
+BEGIN;
+
+DROP TABLE IF EXISTS /*_*/oldimage_tmp;
+CREATE TABLE /*_*/oldimage_tmp (
+ oi_name varchar(255) binary NOT NULL default '',
+ oi_archive_name varchar(255) binary NOT NULL default '',
+ oi_size int unsigned NOT NULL default 0,
+ oi_width int NOT NULL default 0,
+ oi_height int NOT NULL default 0,
+ oi_bits int NOT NULL default 0,
+ oi_description_id bigint unsigned NOT NULL,
+ oi_user int unsigned NOT NULL default 0,
+ oi_user_text varchar(255) binary NOT NULL DEFAULT '',
+ oi_actor bigint unsigned NOT NULL DEFAULT 0,
+ oi_timestamp binary(14) NOT NULL default '',
+ oi_metadata mediumblob NOT NULL,
+ oi_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE", "3D") default NULL,
+ oi_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart", "chemical") NOT NULL default "unknown",
+ oi_minor_mime varbinary(100) NOT NULL default "unknown",
+ oi_deleted tinyint unsigned NOT NULL default 0,
+ oi_sha1 varbinary(32) NOT NULL default ''
+) /*$wgDBTableOptions*/;
+
+INSERT OR IGNORE INTO /*_*/oldimage_tmp (
+ oi_name, oi_archive_name, oi_size, oi_width, oi_height, oi_bits,
+ oi_description_id, oi_user, oi_user_text, oi_actor, oi_timestamp, oi_metadata,
+ oi_media_type, oi_major_mime, oi_minor_mime, oi_deleted, oi_sha1
+ ) SELECT
+ oi_name, oi_archive_name, oi_size, oi_width, oi_height, oi_bits,
+ oi_description_id, oi_user, oi_user_text, oi_actor, oi_timestamp, oi_metadata,
+ oi_media_type, oi_major_mime, oi_minor_mime, oi_deleted, oi_sha1
+ FROM /*_*/oldimage;
+
+DROP TABLE /*_*/oldimage;
+ALTER TABLE /*_*/oldimage_tmp RENAME TO /*_*/oldimage;
+CREATE INDEX /*i*/oi_usertext_timestamp ON /*_*/oldimage (oi_user_text,oi_timestamp);
+CREATE INDEX /*i*/oi_actor_timestamp ON /*_*/oldimage (oi_actor,oi_timestamp);
+CREATE INDEX /*i*/oi_name_timestamp ON /*_*/oldimage (oi_name,oi_timestamp);
+CREATE INDEX /*i*/oi_name_archive_name ON /*_*/oldimage (oi_name,oi_archive_name(14));
+CREATE INDEX /*i*/oi_sha1 ON /*_*/oldimage (oi_sha1(10));
+
+COMMIT;
--- /dev/null
+--
+-- patch-protected_titles-drop-pt_reason.sql
+--
+-- T166732. Drop old xx_comment fields, and defaults from xx_comment_id fields.
+
+BEGIN;
+
+DROP TABLE IF EXISTS /*_*/protected_titles_tmp;
+CREATE TABLE /*_*/protected_titles_tmp (
+ pt_namespace int NOT NULL,
+ pt_title varchar(255) binary NOT NULL,
+ pt_user int unsigned NOT NULL,
+ pt_reason_id bigint unsigned NOT NULL,
+ pt_timestamp binary(14) NOT NULL,
+ pt_expiry varbinary(14) NOT NULL default '',
+ pt_create_perm varbinary(60) NOT NULL,
+ PRIMARY KEY (pt_namespace,pt_title)
+) /*$wgDBTableOptions*/;
+
+INSERT OR IGNORE INTO /*_*/protected_titles_tmp (
+ pt_namespace, pt_title, pt_user, pt_reason_id, pt_timestamp, pt_expiry, pt_create_perm
+ ) SELECT
+ pt_namespace, pt_title, pt_user, pt_reason_id, pt_timestamp, pt_expiry, pt_create_perm
+ FROM /*_*/protected_titles;
+
+DROP TABLE /*_*/protected_titles;
+ALTER TABLE /*_*/protected_titles_tmp RENAME TO /*_*/protected_titles;
+CREATE INDEX /*i*/pt_timestamp ON /*_*/protected_titles (pt_timestamp);
+
+COMMIT;
--- /dev/null
+--
+-- patch-recentchanges-drop-rc_comment.sql
+--
+-- T166732. Drop old xx_comment fields, and defaults from xx_comment_id fields.
+
+BEGIN;
+
+DROP TABLE IF EXISTS /*_*/recentchanges_tmp;
+CREATE TABLE /*_*/recentchanges_tmp (
+ rc_id int NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ rc_timestamp varbinary(14) NOT NULL default '',
+ rc_user int unsigned NOT NULL default 0,
+ rc_user_text varchar(255) binary NOT NULL DEFAULT '',
+ rc_actor bigint unsigned NOT NULL DEFAULT 0,
+ rc_namespace int NOT NULL default 0,
+ rc_title varchar(255) binary NOT NULL default '',
+ rc_comment_id bigint unsigned NOT NULL,
+ rc_minor tinyint unsigned NOT NULL default 0,
+ rc_bot tinyint unsigned NOT NULL default 0,
+ rc_new tinyint unsigned NOT NULL default 0,
+ rc_cur_id int unsigned NOT NULL default 0,
+ rc_this_oldid int unsigned NOT NULL default 0,
+ rc_last_oldid int unsigned NOT NULL default 0,
+ rc_type tinyint unsigned NOT NULL default 0,
+ rc_source varchar(16) binary not null default '',
+ rc_patrolled tinyint unsigned NOT NULL default 0,
+ rc_ip varbinary(40) NOT NULL default '',
+ rc_old_len int,
+ rc_new_len int,
+ rc_deleted tinyint unsigned NOT NULL default 0,
+ rc_logid int unsigned NOT NULL default 0,
+ rc_log_type varbinary(255) NULL default NULL,
+ rc_log_action varbinary(255) NULL default NULL,
+ rc_params blob NULL
+) /*$wgDBTableOptions*/;
+
+INSERT OR IGNORE INTO /*_*/recentchanges_tmp (
+ rc_id, rc_timestamp, rc_user, rc_user_text, rc_actor, rc_namespace, rc_title,
+ rc_comment_id, rc_minor, rc_bot, rc_new, rc_cur_id, rc_this_oldid, rc_last_oldid,
+ rc_type, rc_source, rc_patrolled, rc_ip, rc_old_len, rc_new_len, rc_deleted,
+ rc_logid, rc_log_type, rc_log_action, rc_params
+ ) SELECT
+ rc_id, rc_timestamp, rc_user, rc_user_text, rc_actor, rc_namespace, rc_title,
+ rc_comment_id, rc_minor, rc_bot, rc_new, rc_cur_id, rc_this_oldid, rc_last_oldid,
+ rc_type, rc_source, rc_patrolled, rc_ip, rc_old_len, rc_new_len, rc_deleted,
+ rc_logid, rc_log_type, rc_log_action, rc_params
+ FROM /*_*/recentchanges;
+
+DROP TABLE /*_*/recentchanges;
+ALTER TABLE /*_*/recentchanges_tmp RENAME TO /*_*/recentchanges;
+CREATE INDEX /*i*/rc_timestamp ON /*_*/recentchanges (rc_timestamp);
+CREATE INDEX /*i*/rc_namespace_title_timestamp ON /*_*/recentchanges (rc_namespace, rc_title, rc_timestamp);
+CREATE INDEX /*i*/rc_cur_id ON /*_*/recentchanges (rc_cur_id);
+CREATE INDEX /*i*/new_name_timestamp ON /*_*/recentchanges (rc_new,rc_namespace,rc_timestamp);
+CREATE INDEX /*i*/rc_ip ON /*_*/recentchanges (rc_ip);
+CREATE INDEX /*i*/rc_ns_usertext ON /*_*/recentchanges (rc_namespace, rc_user_text);
+CREATE INDEX /*i*/rc_ns_actor ON /*_*/recentchanges (rc_namespace, rc_actor);
+CREATE INDEX /*i*/rc_user_text ON /*_*/recentchanges (rc_user_text, rc_timestamp);
+CREATE INDEX /*i*/rc_actor ON /*_*/recentchanges (rc_actor, rc_timestamp);
+CREATE INDEX /*i*/rc_name_type_patrolled_timestamp ON /*_*/recentchanges (rc_namespace, rc_type, rc_patrolled, rc_timestamp);
+CREATE INDEX /*i*/rc_this_oldid ON /*_*/recentchanges (rc_this_oldid);
+
+COMMIT;
$primaryOldid = $revs[$i]->rev_text_id;
# Get the text of each revision and add it to the object
- // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
for ( $j = 0; $j < $thisChunkSize && $chunk->isHappy(); $j++ ) {
$oldid = $revs[$i + $j]->rev_text_id;
ar_title varchar(255) binary NOT NULL default '',
-- Basic revision stuff...
- ar_comment varbinary(767) NOT NULL default '', -- Deprecated in favor of ar_comment_id
- ar_comment_id bigint unsigned NOT NULL DEFAULT 0, -- ("DEFAULT 0" is temporary, signaling that ar_comment should be used)
+ ar_comment_id bigint unsigned NOT NULL,
ar_user int unsigned NOT NULL default 0, -- Deprecated in favor of ar_actor
ar_user_text varchar(255) binary NOT NULL DEFAULT '', -- Deprecated in favor of ar_actor
ar_actor bigint unsigned NOT NULL DEFAULT 0, -- ("DEFAULT 0" is temporary, signaling that ar_user/ar_user_text should be used)
-- Actor who made the block.
ipb_by_actor bigint unsigned NOT NULL DEFAULT 0, -- ("DEFAULT 0" is temporary, signaling that ipb_by/ipb_by_text should be used)
- -- Text comment made by blocker. Deprecated in favor of ipb_reason_id
- ipb_reason varbinary(767) NOT NULL default '',
-
-- Key to comment_id. Text comment made by blocker.
- -- ("DEFAULT 0" is temporary, signaling that ipb_reason should be used)
- ipb_reason_id bigint unsigned NOT NULL DEFAULT 0,
+ ipb_reason_id bigint unsigned NOT NULL,
-- Creation (or refresh) date in standard YMDHMS form.
-- IP blocks expire automatically.
-- Description field as entered by the uploader.
-- This is displayed in image upload history and logs.
- -- Deprecated in favor of img_description_id.
- img_description varbinary(767) NOT NULL default '',
-
- img_description_id bigint unsigned NOT NULL DEFAULT 0, -- ("DEFAULT 0" is temporary, signaling that img_description should be used)
+ img_description_id bigint unsigned NOT NULL,
-- user_id and user_name of uploader.
-- Deprecated in favor of img_actor.
oi_width int NOT NULL default 0,
oi_height int NOT NULL default 0,
oi_bits int NOT NULL default 0,
- oi_description varbinary(767) NOT NULL default '', -- Deprecated.
- oi_description_id bigint unsigned NOT NULL DEFAULT 0, -- ("DEFAULT 0" is temporary, signaling that oi_description should be used)
+ oi_description_id bigint unsigned NOT NULL,
oi_user int unsigned NOT NULL default 0, -- Deprecated in favor of oi_actor
oi_user_text varchar(255) binary NOT NULL DEFAULT '', -- Deprecated in favor of oi_actor
oi_actor bigint unsigned NOT NULL DEFAULT 0, -- ("DEFAULT 0" is temporary, signaling that oi_user/oi_user_text should be used)
-- Deletion information, if this file is deleted.
fa_deleted_user int,
fa_deleted_timestamp binary(14) default '',
- fa_deleted_reason varbinary(767) default '', -- Deprecated
- fa_deleted_reason_id bigint unsigned NOT NULL DEFAULT 0, -- ("DEFAULT 0" is temporary, signaling that fa_deleted_reason should be used)
+ fa_deleted_reason_id bigint unsigned NOT NULL,
-- Duped fields from image
fa_size int unsigned default 0,
fa_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE", "3D") default NULL,
fa_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart", "chemical") default "unknown",
fa_minor_mime varbinary(100) default "unknown",
- fa_description varbinary(767) default '', -- Deprecated
- fa_description_id bigint unsigned NOT NULL DEFAULT 0, -- ("DEFAULT 0" is temporary, signaling that fa_description should be used)
+ fa_description_id bigint unsigned NOT NULL,
fa_user int unsigned default 0, -- Deprecated in favor of fa_actor
fa_user_text varchar(255) binary DEFAULT '', -- Deprecated in favor of fa_actor
fa_actor bigint unsigned NOT NULL DEFAULT 0, -- ("DEFAULT 0" is temporary, signaling that fa_user/fa_user_text should be used)
rc_title varchar(255) binary NOT NULL default '',
-- as in revision...
- rc_comment varbinary(767) NOT NULL default '', -- Deprecated.
- rc_comment_id bigint unsigned NOT NULL DEFAULT 0, -- ("DEFAULT 0" is temporary, signaling that rc_comment should be used)
+ rc_comment_id bigint unsigned NOT NULL,
rc_minor tinyint unsigned NOT NULL default 0,
-- Edits by user accounts with the 'bot' rights key are
log_title varchar(255) binary NOT NULL default '',
log_page int unsigned NULL,
- -- Freeform text. Interpreted as edit history comments.
- -- Deprecated in favor of log_comment_id.
- log_comment varbinary(767) NOT NULL default '',
-
-- Key to comment_id. Comment summarizing the change.
- -- ("DEFAULT 0" is temporary, signaling that log_comment should be used)
- log_comment_id bigint unsigned NOT NULL DEFAULT 0,
+ log_comment_id bigint unsigned NOT NULL,
-- miscellaneous parameters:
-- LF separated list (old system) or serialized PHP array (new system)
pt_namespace int NOT NULL,
pt_title varchar(255) binary NOT NULL,
pt_user int unsigned NOT NULL,
- pt_reason varbinary(767) default '', -- Deprecated.
- pt_reason_id bigint unsigned NOT NULL DEFAULT 0, -- ("DEFAULT 0" is temporary, signaling that pt_reason should be used)
+ pt_reason_id bigint unsigned NOT NULL,
pt_timestamp binary(14) NOT NULL,
pt_expiry varbinary(14) NOT NULL default '',
pt_create_perm varbinary(60) NOT NULL,
/**
* We don't want anybody to mess with our stuff...
- * @access private
+ * @private
*/
function lock() {
$set = [ 'user', 'revision' ];
}
/**
- * @access private
+ * @private
*/
function unlock() {
$this->db->query( "UNLOCK TABLES", __METHOD__ );
/**
* Grab usernames for which multiple records are present in the database.
* @return array
- * @access private
+ * @private
*/
function getDupes() {
$user = $this->db->tableName( 'user' );
* for edits. If the dupes have no edits, we can safely remove them.
* @param string $name
* @param bool $doDelete
- * @access private
+ * @private
*/
function examine( $name, $doDelete ) {
$result = $this->db->select( 'user',
* where it might show up...
* @param int $userid
* @return int
- * @access private
+ * @private
*/
function editCount( $userid ) {
return intval( $this->db->selectField(
/**
* @param int $from
* @param int $to
- * @access private
+ * @private
*/
function reassignEdits( $from, $to ) {
$this->out( 'reassigning... ' );
/**
* Remove a user account line.
* @param int $userid
- * @access private
+ * @private
*/
function trimAccount( $userid ) {
$this->out( "deleting..." );
"grunt-jsonlint": "1.1.0",
"grunt-karma": "3.0.0",
"grunt-stylelint": "0.10.1",
+ "grunt-svgmin": "5.0.0",
"karma": "3.0.0",
"karma-chrome-launcher": "2.2.0",
"karma-firefox-launcher": "1.1.0",
'scripts' => 'resources/lib/jquery.fullscreen.js',
],
'jquery.getAttrs' => [
- 'targets' => [ 'desktop', 'mobile' ],
'scripts' => 'resources/src/jquery/jquery.getAttrs.js',
'targets' => [ 'desktop', 'mobile' ],
],
'deprecated' => true,
'scripts' => 'resources/lib/jquery.ui/jquery.ui.widget.js',
'group' => 'jquery.ui',
+ 'targets' => [ 'desktop', 'mobile' ],
],
// Effects
'jquery.effects.core' => [
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="21" height="9" viewBox="0 0 21 9">
- <path d="M14.5 5l-4 4-4-4zM14.5 4l-4-4-4 4z"/>
+ <path d="M14.5 5l-4 4-4-4zm0-1l-4-4-4 4z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="42" height="20" viewBox="0 0 42 20">
- <path fill="#fff" stroke="#000" stroke-width="2" stroke-miterlimit="10" d="M11 10h17.064"/>
+ <path fill="#fff" stroke="#000" stroke-miterlimit="10" stroke-width="2" d="M11 10h17.064"/>
<path d="M23 6l8 4-8 4z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="42" height="20" viewBox="0 0 42 20">
- <path fill="#fff" stroke="#000" stroke-width="2" stroke-miterlimit="10" d="M31 10H13.936"/>
+ <path fill="#fff" stroke="#000" stroke-miterlimit="10" stroke-width="2" d="M31 10H13.936"/>
<path d="M19 6l-8 4 8 4z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="47" height="20" viewBox="0 0 47 20">
- <path fill="none" stroke="#000" stroke-width="2" stroke-miterlimit="10" d="M14.98 2.5V11c0 1.04 1.02 1.98 2.02 1.98h6l3 .02"/>
+ <path fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2" d="M14.98 2.5V11c0 1.04 1.02 1.98 2.02 1.98h6l3 .02"/>
<path d="M23.48 9.5l.02 7L30 13z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="47" height="20" viewBox="0 0 47 20">
- <path fill="none" stroke="#000" stroke-width="2" stroke-miterlimit="10" d="M32.002 2.5V11c0 1.04-1.02 1.98-2.02 1.98h-6l-3 .02"/>
+ <path fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2" d="M32.002 2.5V11c0 1.04-1.02 1.98-2.02 1.98h-6l-3 .02"/>
<path d="M23.502 9.5l-.02 7-6.5-3.5z"/>
</svg>
<rect width="246" height="246" x="5" y="5" fill="#f49c52" rx="50" ry="50"/>
<rect width="236" height="236" x="10" y="10" fill="url(#a)" rx="47" ry="47"/>
<circle cx="68" cy="189" r="24" fill="#fff"/>
- <path fill="#fff" d="M160 213h-34a82 82 0 0 0-82-82v-34a116 116 0 0 1 116 116zM184 213a140 140 0 0 0-140-140v-35a175 175 0 0 1 175 175z"/>
+ <path fill="#fff" d="M160 213h-34a82 82 0 0 0-82-82V97a116 116 0 0 1 116 116zm24 0A140 140 0 0 0 44 73V38a175 175 0 0 1 175 175z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
- <path d="M12.001 2.085c-5.478 0-9.916 4.438-9.916 9.916 0 5.476 4.438 9.914 9.916 9.914 5.476 0 9.914-4.438 9.914-9.914 0-5.478-4.438-9.916-9.914-9.916zm.001 18c-4.465 0-8.084-3.619-8.084-8.083 0-4.465 3.619-8.084 8.084-8.084 4.464 0 8.083 3.619 8.083 8.084 0 4.464-3.619 8.083-8.083 8.083z"/>
- <path d="M11.766 6.688c-2.5 0-3.219 2.188-3.219 2.188l1.411.854s.298-.791.901-1.229c.516-.375 1.625-.625 2.219.125.701.885-.17 1.587-1.078 2.719-.953 1.186-1 3.655-1 3.655h1.969s.135-2.318 1.041-3.381c.603-.707 1.443-1.338 1.443-2.494s-1.187-2.437-3.687-2.437zM11 16h2v2h-2z"/>
+ <path d="M12.001 2.085a9.914 9.914 0 0 0-9.916 9.916c0 5.476 4.438 9.914 9.916 9.914a9.913 9.913 0 0 0 9.914-9.914c0-5.478-4.438-9.916-9.914-9.916zm.001 18a8.083 8.083 0 1 1 0-16.167 8.083 8.083 0 0 1 0 16.167z"/>
+ <path d="M11.766 6.688c-2.5 0-3.219 2.188-3.219 2.188l1.411.854s.298-.791.901-1.229c.516-.375 1.625-.625 2.219.125.701.885-.17 1.587-1.078 2.719C11.047 12.531 11 15 11 15h1.969s.135-2.318 1.041-3.381c.603-.707 1.443-1.338 1.443-2.494s-1.187-2.437-3.687-2.437zM11 16h2v2h-2z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="21.059" height="21.06">
- <path fill="#54595d" d="M10.529 0c-5.814 0-10.529 4.714-10.529 10.529s4.715 10.53 10.529 10.53c5.816 0 10.529-4.715 10.529-10.53s-4.712-10.529-10.529-10.529zm-.002 16.767c-.861 0-1.498-.688-1.498-1.516 0-.862.637-1.534 1.498-1.534.828 0 1.5.672 1.5 1.534 0 .827-.672 1.516-1.5 1.516zm2.137-6.512c-.723.568-1 .931-1 1.739v.5h-2.205v-.603c0-1.517.449-2.136 1.154-2.688.707-.552 1.139-.845 1.139-1.637 0-.672-.414-1.051-1.24-1.051-.707 0-1.328.189-1.982.638l-1.051-1.807c.861-.604 1.93-1.034 3.342-1.034 1.912 0 3.516 1.051 3.516 3.066-.001 1.43-.794 2.188-1.673 2.877z"/>
+ <path fill="#54595d" d="M10.529 0C4.715 0 0 4.714 0 10.529s4.715 10.53 10.529 10.53c5.816 0 10.529-4.715 10.529-10.53S16.346 0 10.529 0zm-.002 16.767c-.861 0-1.498-.688-1.498-1.516 0-.862.637-1.534 1.498-1.534.828 0 1.5.672 1.5 1.534 0 .827-.672 1.516-1.5 1.516zm2.137-6.512c-.723.568-1 .931-1 1.739v.5H9.459v-.603c0-1.517.449-2.136 1.154-2.688.707-.552 1.139-.845 1.139-1.637 0-.672-.414-1.051-1.24-1.051-.707 0-1.328.189-1.982.638L7.479 5.346c.861-.604 1.93-1.034 3.342-1.034 1.912 0 3.516 1.051 3.516 3.066-.001 1.43-.794 2.188-1.673 2.877z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
- <path fill="#72777d" d="M8 1.533v9.671l-4.752-4.871z"/>
+ <path fill="#72777d" d="M8 1.533v9.671L3.248 6.333z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
- <path fill="#72777d" d="M1.165 3.624h9.671l-4.871 4.752z"/>
+ <path fill="#72777d" d="M1.165 3.624h9.671L5.965 8.376z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="15" height="11" viewBox="0 0 11 15">
<g fill="#fff" stroke="#000">
- <path d="M1.509 1.865h10.99v7.919h-10.99z"/>
+ <path d="M1.509 1.865h10.99v7.919H1.509z"/>
<path d="M-1.499 6.868h5.943v4.904h-5.943z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" width="15" height="11" viewBox="0 0 11 15">
<g fill="#fff" stroke="#000">
<path d="M9.491 1.865h-10.99v7.919h10.99z"/>
- <path d="M12.499 6.868h-5.943v4.904h5.943z"/>
+ <path d="M12.499 6.868H6.556v4.904h5.943z"/>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
- <path fill="#36c" d="M1 10h10l-5-8.658z"/>
+ <path fill="#36c" d="M1 10h10L6 1.342z"/>
</svg>
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="13" width="13" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<g transform="translate(-36.467808,-258.39005)">
-<path style="opacity:1;fill:#3366bb;" d="m43.47,259.4-3,3-3,0,0,4,3,0,3,3zm-1,2.5,0,5-1.5-1.5-2.5,0,0-2,2.5,0z"/>
-<path style="opacity:1;fill:#15a5ea;" d="m43.9,262.5c0-0.6213,0.6213-1.243,1.243-0.6213,0,0,0.6213,0.6213,0.6213,2.485s-0.6213,2.485-0.6213,2.485c-0.6213,0.6213-1.243,0-1.243-0.6213,0,0,0.6213-0.6213,0.6213-1.864s-0.6213-1.864-0.6213-1.864z"/>
-<path style="opacity:1;fill:#15a5ea;" d="m45.76,261.2c0-0.6213,0.6213-1.243,1.243-0.6213,0,0,1.243,1.243,1.243,3.728s-1.243,3.728-1.243,3.728c-0.6213,0.6213-1.243,0-1.243-0.6213,0,0,1.243-1.243,1.243-3.107s-1.243-3.107-1.243-3.107z"/>
-</g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13">
+ <path fill="#36b" d="M7.002 1.01l-3 3h-3v4h3l3 3zm-1 2.5v5l-1.5-1.5h-2.5v-2h2.5z"/>
+ <path fill="#15a5ea" d="M7.432 4.11c0-.621.621-1.243 1.243-.621 0 0 .621.621.621 2.485s-.62 2.485-.62 2.485c-.622.621-1.244 0-1.244-.622 0 0 .621-.62.621-1.864s-.62-1.864-.62-1.864z"/>
+ <path fill="#15a5ea" d="M9.292 2.81c0-.621.621-1.243 1.243-.621 0 0 1.243 1.243 1.243 3.728s-1.243 3.728-1.243 3.728c-.621.621-1.243 0-1.243-.622 0 0 1.243-1.243 1.243-3.107S9.292 2.81 9.292 2.81z"/>
</svg>
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="13" width="13" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<g transform="translate(-36.467808,-258.39005)">
-<path style="opacity:1;fill:#3366bb;" d="m42.47,259.4,3,3,3,0,0,4-3,0-3,3zm1,2.5,0,5,1.5-1.5,2.5,0,0-2-2.5,0z"/>
-<path style="opacity:1;fill:#15a5ea;" d="m42.04,262.5c0-0.6213-0.6213-1.243-1.243-0.6213,0,0-0.6213,0.6213-0.6213,2.485s0.6213,2.485,0.6213,2.485c0.6213,0.6213,1.243,0,1.243-0.6213,0,0-0.6213-0.6213-0.6213-1.864s0.6213-1.864,0.6213-1.864z"/>
-<path style="opacity:1;fill:#15a5ea;" d="m40.17,261.2c0-0.6213-0.6213-1.243-1.243-0.6213,0,0-1.243,1.243-1.243,3.728s1.243,3.728,1.243,3.728c0.6213,0.6213,1.243,0,1.243-0.6213,0,0-1.243-1.243-1.243-3.107s1.243-3.107,1.243-3.107z"/>
-</g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13">
+ <path fill="#36b" d="M6.002 1.01l3 3h3v4h-3l-3 3zm1 2.5v5l1.5-1.5h2.5v-2h-2.5z"/>
+ <path fill="#15a5ea" d="M5.572 4.11c0-.621-.621-1.243-1.243-.621 0 0-.621.621-.621 2.485s.621 2.485.621 2.485c.621.621 1.243 0 1.243-.622 0 0-.621-.62-.621-1.864s.621-1.864.621-1.864zm-1.87-1.3c0-.621-.621-1.243-1.243-.621 0 0-1.243 1.243-1.243 3.728S2.46 9.645 2.46 9.645c.621.621 1.243 0 1.243-.622 0 0-1.243-1.243-1.243-3.107S3.702 2.81 3.702 2.81z"/>
</svg>
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="13" width="13" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<g transform="translate(-36.467808,-258.39005)">
-<path style="opacity:1;fill:#3366bb;" d="m38.09,260.4-0.6213,0.6213,0,5.757,0.6213,0.6213,1.689,0-0.6213,2.728,4.311-2.728,4.379,0,0.6213-0.6213,0-5.757-0.6213-0.6213zm0.3787,1,9,0,0,5-4,0-2.902,1.897,0.9021-1.897-3,0z"/>
-</g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13">
+ <path fill="#36b" d="M1.622 2.01l-.621.621v5.757l.621.622h1.69l-.622 2.728L7 9.01h4.38l.62-.622V2.631l-.621-.621zm.379 1h9v5H7L4.099 9.907 5 8.01H2z"/>
</svg>
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="13" width="13" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<g transform="translate(-36.467808,-258.39005)">
-<path style="opacity:1;fill:#3366bb;" d="m47.85,260.4,0.6213,0.6213,0,5.757-0.6213,0.6213-1.689,0,0.6213,2.728-4.311-2.728-4.379,0-0.6213-0.6213,0-5.757,0.6213-0.6213zm-0.3787,1-9,0,0,5,4,0,2.902,1.897-0.9021-1.897,3,0z"/>
-</g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13">
+ <path fill="#36b" d="M11.382 2.01l.621.621v5.757l-.62.622h-1.69l.621 2.728-4.31-2.728h-4.38l-.62-.622V2.631l.62-.621zm-.379 1h-9v5h4l2.902 1.897-.902-1.897h3z"/>
</svg>
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="13" width="13" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<path style="opacity:1;fill:#15a5ea;" d="m7.5,2,0,3,2.5,0,1-1-2.5,0,0-3z"/>
-<path style="opacity:1;fill:#3366bb;" d="m3,1,0,10,8,0,0-7-2.5-3zm1,1,4,0,2,2.5,0,5.5-6,0z"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13">
+ <path fill="#15a5ea" d="M7.5 2v3H10l1-1H8.5V1z"/>
+ <path fill="#36b" d="M3 1v10h8V4L8.5 1zm1 1h4l2 2.5V10H4z"/>
</svg>
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="13" width="13" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<path style="opacity:1;fill:#15a5ea;" d="m5.5,2,0,3-2.5,0-1-1,2.5,0,0-3z"/>
-<path style="opacity:1;fill:#3366bb;" d="m10,1,0,10-8,0,0-7,2.5-3zm-1,1-4,0-2,2.5,0,5.5,6,0z"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13">
+ <path fill="#15a5ea" d="M5.5 2v3H3L2 4h2.5V1z"/>
+ <path fill="#36b" d="M10 1v10H2V4l2.5-3zM9 2H5L3 4.5V10h6z"/>
</svg>
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="13" width="13" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<g transform="translate(-36.467808,-258.39005)">
-<path style="opacity:1;fill:#3366bb;" d="m41.47,259.4,7,0,0,7-2-2-3,2,0-1,3-2.25,1,1,0-3.75-3.75,0,1,1-2.25,3-1,0,2-3z"/>
-<path style="opacity:1;fill:#3366bb;" d="m43.47,261.4-5,0,0,8,8,0,0-5-1,0,0,4-6,0,0-6,4,0z"/>
-<path style="opacity:1;fill:#15a5ea;" d="m40.55,263.9c0-0.6213,0.6213-0.6213,0.6213-0.6213,1.864,0.6213,3.107,1.864,3.728,3.728,0,0,0,0.6213-0.6213,0.6213-1.243-1.864-1.864-2.485-3.728-3.728z"/>
-</g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13">
+ <path fill="#36b" d="M5.002 1.01h7v7l-2-2-3 2v-1l3-2.25 1 1V2.01h-3.75l1 1-2.25 3h-1l2-3z"/>
+ <path fill="#36b" d="M7.002 3.01h-5v8h8v-5h-1v4h-6v-6h4z"/>
+ <path fill="#15a5ea" d="M4.082 5.51c0-.621.621-.621.621-.621 1.864.621 3.107 1.864 3.728 3.728 0 0 0 .621-.62.621-1.245-1.864-1.866-2.485-3.73-3.728z"/>
</svg>
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="13" width="13" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<g transform="translate(-36.467808,-258.39005)">
-<path style="opacity:1;fill:#3366bb;" d="m44.47,259.4-7,0,0,7,2-2,3,2,0-1-3-2.25-1,1,0-3.75,3.75,0-1,1,2.25,3,1,0-2-3z"/>
-<path style="opacity:1;fill:#3366bb;" d="m42.47,261.4,5,0,0,8-8,0,0-5,1,0,0,4,6,0,0-6-4,0z"/>
-<path style="opacity:1;fill:#15a5ea;" d="m45.39,263.9c0-0.6213-0.6213-0.6213-0.6213-0.6213-1.864,0.6213-3.107,1.864-3.728,3.728l0.6213,0.6213c1.243-1.864,1.864-2.485,3.728-3.728z"/>
-</g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13">
+ <path fill="#36b" d="M8.002 1.01h-7v7l2-2 3 2v-1l-3-2.25-1 1V2.01h3.75l-1 1 2.25 3h1l-2-3z"/>
+ <path fill="#36b" d="M6.002 3.01h5v8h-8v-5h1v4h6v-6h-4z"/>
+ <path fill="#15a5ea" d="M8.922 5.51c0-.621-.621-.621-.621-.621-1.864.621-3.107 1.864-3.728 3.728l.621.621C6.437 7.374 7.058 6.753 8.922 5.51z"/>
</svg>
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="13" width="13" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<g transform="translate(-136.35715,-374.43362)">
-<path style="opacity:1;fill:#3465ba;" d="m137.4,376.9,0,7.5,1-0.9872,0-6.013,2,0,2,1,4-0.0002,0,2,1,0,0-2.5-0.5-0.5002-4.5,0.0002-2-1-2.5,0z"/>
-<path style="opacity:1;fill:#16a4e8;" d="m142.4,379.4-1-0.0001-2.5,0-0.5,0.5-1,4.5,10-0.0001,0-4.5-0.5-0.5zm0,1,4-0.0001,0,3-7.75-0.0001,0.75-3,2,0z"/>
-<path style="opacity:1;fill:#3465ba;" d="m138.4,385.4,0,1,8,0,0-1z"/>
-<path style="opacity:1;fill:#3465ba;" d="m141.4,383.9,0,2,2,0,0-2c0-0.5-2-0.5-2,0z"/>
-</g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13">
+ <path fill="#3465ba" d="M1.043 2.466v7.5l1-.987V2.966h2l2 1h4v2h1v-2.5l-.5-.5h-4.5l-2-1h-2.5z"/>
+ <path fill="#16a4e8" d="M6.043 4.966h-3.5l-.5.5-1 4.5h10v-4.5l-.5-.5zm0 1h4v3h-7.75l.75-3h2z"/>
+ <path fill="#3465ba" d="M2.043 10.966v1h8v-1z"/>
+ <path fill="#3465ba" d="M5.043 9.466v2h2v-2c0-.5-2-.5-2 0z"/>
</svg>
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="13" width="13" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<g transform="translate(-136.35715,-374.43362)">
-<path style="opacity:1;fill:#3465ba;" d="m148.4,376.9,0,7.5-1-0.9872,0-6.013-2,0-2,1-4-0.0002,0,2-1,0,0-2.5,0.5-0.5002,4.5,0.0002,2-1,2.5,0z"/>
-<path style="opacity:1;fill:#16a4e8;" d="m143.4,379.4,1-0.0001,2.5,0,0.5,0.5,1,4.5-10-0.0001,0-4.5,0.5-0.5zm0,1-4-0.0001,0,3,7.75-0.0001-0.75-3-2,0z"/>
-<path style="opacity:1;fill:#3465ba;" d="m147.4,385.4,0,1-8,0,0-1z"/>
-<path style="opacity:1;fill:#3465ba;" d="m144.4,383.9,0,2-2,0,0-2c0-0.5,2-0.5,2,0z"/>
-</g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13">
+ <path fill="#3465ba" d="M12.043 2.466v7.5l-1-.987V2.966h-2l-2 1h-4v2h-1v-2.5l.5-.5h4.5l2-1h2.5z"/>
+ <path fill="#16a4e8" d="M7.043 4.966h3.5l.5.5 1 4.5h-10v-4.5l.5-.5zm0 1h-4v3h7.75l-.75-3h-2z"/>
+ <path fill="#3465ba" d="M11.043 10.966v1h-8v-1z"/>
+ <path fill="#3465ba" d="M8.043 9.466v2h-2v-2c0-.5 2-.5 2 0z"/>
</svg>
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 15" width="15" height="11">
- <g id="magnify-clip" fill="#fff" stroke="#000">
- <path id="bigbox" d="M1.509 1.865h10.99v7.919h-10.99z"/>
- <path id="smallbox" d="M-1.499 6.868h5.943v4.904h-5.943z"/>
- </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="11" viewBox="0 0 11 15">
+ <g id="magnify-clip" fill="#fff" stroke="#000">
+ <path id="bigbox" d="M1.509 1.865h10.99v7.919H1.509z"/>
+
<path id="smallbox" d="M-1.499 6.868h5.943v4.904h-5.943z"/>
+ </g>
</svg>
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 15" width="15" height="11">
- <g id="magnify-clip" fill="#fff" stroke="#000">
- <path id="bigbox" d="M9.491 1.865h-10.99v7.919h10.99z"/>
- <path id="smallbox" d="M12.499 6.868h-5.943v4.904h5.943z"/>
- </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="11" viewBox="0 0 11 15">
+ <g id="magnify-clip" fill="#fff" stroke="#000">
+
<path id="bigbox" d="M9.491 1.865h-10.99v7.919h10.99z"/>
+ <path id="smallbox" d="M12.499 6.868H6.556v4.904h5.943z"/>
+ </g>
</svg>
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="13" width="13" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<g transform="translate(-36.47,-257.4)">
-<path style="fill:#15a5ea;" d="m38.31,261.4,4.66,4.349,4.66-4.349-0.6213-0.6213-1.243,0.6216-2.796,2.485-2.796-2.485-1.243-0.6216z"/>
-<path style="fill:#3366bb;" d="m37.47,260.4,0,8,11,0,0-8zm1,1,9,0,0,6-9,0z"/>
-</g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13">
+ <path fill="#15a5ea" d="M1.84 4L6.5 8.349 11.16 4l-.621-.621L9.296 4 6.5 6.485 3.704 4 2.46 3.38z"/>
+ <path fill="#36b" d="M1 3v8h11V3zm1 1h9v6H2z"/>
</svg>
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="13" width="13" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<g transform="translate(-36.4678,-258.39)">
-<path style="opacity:1;fill-opacity:1;fill:#15a5ea;" d="m38.96,260.4,0,0.6213,8.098,0,0-0.6213z"/>
-<path style="opacity:1;fill-opacity:1;fill:#15a5ea;" d="m38.96,268.4,8.098,0,0-0.6213-8.098,0z"/>
-<path style="opacity:1;fill-opacity:1;fill:#15a5ea;" d="m38.96,262.3,0,0.6213,1.869,0,0-0.6213zm6.229,0,0,0.6213,1.869,0,0-0.6213z"/>
-<path style="opacity:1;fill-opacity:1;fill:#15a5ea;" d="m38.96,266,0,0.6213,1.869,0,0-0.6213zm6.229,0,0,0.6213,1.869,0,0-0.6213z"/>
-<path style="opacity:1;fill-opacity:1;fill:#15a5ea;" d="m38.96,264.8,8.098,0,0-0.6213-8.098,0z"/>
-<path style="opacity:1;fill:#15a5ea;" d="m40.83,263.9,0,1.243,4.36,0,0-1.243z"/>
-<path style="opacity:1;fill:#3366bb;" d="m40.47,260.4,0,8,5,0,0-8zm1,1,3,0,0,6-3,0z"/>
-<path style="opacity:1;fill:#3366bb;" d="m38.47,259.4,1,0,0,10-1,0z"/>
-<path style="opacity:1;fill:#3366bb;" d="m46.47,259.4,1,0,0,10-1,0z"/>
-</g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13">
+ <path fill="#15a5ea" d="M2.492 2.01v.621h8.098V2.01zm0 8h8.098v-.621H2.492zm0-6.1v.621h1.87V3.91zm6.23 0v.621h1.868V3.91zm-6.23 3.7v.621h1.87V7.61zm6.23 0v.621h1.868V7.61zm-6.23-1.2h8.098v-.621H2.492z"/>
+ <path fill="#15a5ea" d="M4.362 5.51v1.243h4.36V5.51z"/>
+ <path fill="#36b" d="M4.002 2.01v8h5v-8zm1 1h3v6h-3zm-3-2h1v10h-1zm8 0h1v10h-1z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
- <path d="M 5,3 C 5,3 5,16.507875 5,17.25 5,19.208049 6.582269,21 8.502269,21 8.7138904,21 19,21 19,21 L 19,3 z m 8.002269,3 4,0 0,4 L 15.721019,8.71875 12.439769,12 15.721019,15.28125 17.002269,14 l 0,4 -4,0 1.3125,-1.3125 -3.71875,-3.6875 -3.59375,0 0,-2 3.59375,0 3.6875,-3.71875 z"/>
+ <path d="M5 3v14.25C5 19.208 6.582 21 8.502 21H19V3zm8.002 3h4v4l-1.281-1.281L12.44 12l3.281 3.281L17.002 14v4h-4l1.313-1.313L10.596 13H7.002v-2h3.594l3.688-3.719z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
- <path d="m 19,3 c 0,0 0,13.507875 0,14.25 C 19,19.208049 17.417731,21 15.497731,21 15.28611,21 5,21 5,21 L 5,3 z m -8.002269,3 -4,0 0,4 L 8.278981,8.71875 11.560231,12 8.278981,15.28125 6.997731,14 l 0,4 4,0 -1.3125,-1.3125 3.71875,-3.6875 3.59375,0 0,-2 -3.59375,0 -3.6875,-3.71875 z"/>
+ <path d="M19 3v14.25c0 1.958-1.582 3.75-3.502 3.75H5V3zm-8.002 3h-4v4l1.281-1.281L11.56 12l-3.28 3.281L6.998 14v4h4l-1.313-1.313L13.404 13h3.594v-2h-3.594L9.716 7.281z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
- <path d="m 12,12 5,0 0,-7 -5,0 z m -5,3 0,1 10,0 0,-1 m 0,-1 0,-1 -10,0 0,1 m 0,4 10,0 0,-1 -10,0 z M 11,7 7,7 7,8 11,8 z m 0,3 0,-1 -4,0 0,1 m 0,1 0,1 4,0 0,-1 M 11,5 7,5 7,6 11,6 z M 5,3 19,3 19,21 8.692,21 C 6.602,21 5,19.373 5,17.25 z"/>
+ <path d="M12 12h5V5h-5zm-5 3v1h10v-1m0-1v-1H7v1m0 4h10v-1H7zm4-11H7v1h4zm0 3V9H7v1m0 1v1h4v-1m0-6H7v1h4zM5 3h14v18H8.692C6.602 21 5 19.373 5 17.25z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
- <path d="m 12,12 -5,0 0,-7 5,0 z m 5,3 0,1 -10,0 0,-1 m 0,-1 0,-1 10,0 0,1 m 0,4 -10,0 0,-1 10,0 z m -4,-11 4,0 0,1 -4,0 z m 0,3 0,-1 4,0 0,1 m 0,1 0,1 -4,0 0,-1 m 0,-6 4,0 0,1 -4,0 z M 19,3 5,3 5,21 15.308,21 C 17.398,21 19,19.373 19,17.25 z"/>
+ <path d="M12 12H7V5h5zm5 3v1H7v-1m0-1v-1h10v1m0 4H7v-1h10zM13 7h4v1h-4zm0 3V9h4v1m0 1v1h-4v-1m0-6h4v1h-4zm6-2H5v18h10.308C17.398 21 19 19.373 19 17.25z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
- <path d="M5 3v18h10c2 0 4-2 4-4V3zm7.644 13.572h-1.687v-1.6h1.687zm1.982-6c-.063.217-.148.404-.25.563-.104.16-.225.3-.36.423l-.402.364-.438.396c-.134.127-.25.273-.353.428-.103.16-.18.346-.233.555-.054.215-.08.474-.08.784h-1.36c0-.378.017-.696.057-.955.036-.26.098-.488.183-.688.085-.196.188-.37.31-.52.12-.15.267-.295.433-.44l.385-.332c.12-.105.233-.214.327-.34.098-.124.17-.265.228-.42.054-.155.08-.337.08-.55 0-.256-.044-.48-.133-.66-.09-.183-.197-.333-.322-.442-.125-.11-.26-.19-.403-.246-.143-.05-.268-.077-.376-.077-.52 0-.905.173-1.15.52-.247.345-.372.81-.372 1.39H8.962c0-.468.067-.895.206-1.282.14-.382.34-.714.604-.987.264-.273.582-.487.957-.632.37-.15.79-.223 1.252-.223.385 0 .743.06 1.078.174.33.114.622.282.868.5.246.218.443.487.586.814.143.323.215.692.215 1.1-.01.306-.04.565-.104.784z"/>
+ <path d="M5 3v18h10c2 0 4-2 4-4V3zm7.644 13.572h-1.687v-1.6h1.687zm1.982-6a2.144 2.144 0 0 1-.25.563c-.104.16-.225.3-.36.423l-.402.364-.438.396c-.134.127-.25.273-.353.428-.103.16-.18.346-.233.555-.054.215-.08.474-.08.784h-1.36c0-.378.017-.696.057-.955.036-.26.098-.488.183-.688.085-.196.188-.37.31-.52.12-.15.267-.295.433-.44l.385-.332c.12-.105.233-.214.327-.34.098-.124.17-.265.228-.42a1.67 1.67 0 0 0 .08-.55c0-.256-.044-.48-.133-.66a1.397 1.397 0 0 0-.322-.442 1.35 1.35 0 0 0-.403-.246 1.17 1.17 0 0 0-.376-.077c-.52 0-.905.173-1.15.52-.247.345-.372.81-.372 1.39H8.962c0-.468.067-.895.206-1.282a2.641 2.641 0 0 1 1.561-1.619c.37-.15.79-.223 1.252-.223.385 0 .743.06 1.078.174.33.114.622.282.868.5.246.218.443.487.586.814.143.323.215.692.215 1.1-.01.306-.04.565-.104.784z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
- <path d="m 5,3 0,14 c 0,2.125 1.911,4 4,4 l 10,0 0,-18 z m 7.644,13.572 -1.687,0 0,-1.601 1.687,0 z m 1.982,-6.001 c -0.063,0.218 -0.148,0.405 -0.251,0.564 -0.103,0.159 -0.224,0.3 -0.358,0.423 l -0.403,0.364 -0.438,0.396 c -0.134,0.127 -0.251,0.273 -0.353,0.428 -0.103,0.159 -0.179,0.346 -0.233,0.555 -0.054,0.214 -0.081,0.473 -0.081,0.783 l -1.36,0 c 0,-0.378 0.018,-0.696 0.058,-0.955 0.036,-0.259 0.098,-0.487 0.183,-0.687 0.085,-0.196 0.188,-0.369 0.309,-0.519 0.121,-0.15 0.268,-0.296 0.434,-0.441 l 0.385,-0.332 c 0.121,-0.105 0.233,-0.214 0.327,-0.341 0.098,-0.123 0.17,-0.264 0.228,-0.419 0.054,-0.155 0.081,-0.337 0.081,-0.551 0,-0.255 -0.045,-0.478 -0.134,-0.66 C 12.931,8.997 12.823,8.847 12.698,8.738 12.573,8.629 12.438,8.547 12.295,8.492 12.152,8.442 12.027,8.415 11.919,8.415 c -0.519,0 -0.904,0.173 -1.15,0.519 -0.246,0.346 -0.371,0.81 -0.371,1.392 l -1.436,0 C 8.962,9.857 9.029,9.43 9.168,9.043 9.307,8.661 9.508,8.329 9.772,8.056 10.036,7.783 10.354,7.569 10.729,7.424 11.1,7.274 11.521,7.201 11.982,7.201 c 0.385,0 0.743,0.059 1.078,0.173 0.331,0.114 0.622,0.282 0.868,0.5 0.246,0.218 0.443,0.487 0.586,0.814 0.143,0.323 0.215,0.692 0.215,1.101 -0.009,0.305 -0.04,0.564 -0.103,0.783 z"/>
+ <path d="M5 3v14c0 2.125 1.911 4 4 4h10V3zm7.644 13.572h-1.687v-1.601h1.687zm1.982-6.001a2.106 2.106 0 0 1-.609.987l-.403.364-.438.396a2.422 2.422 0 0 0-.353.428 1.881 1.881 0 0 0-.233.555 3.236 3.236 0 0 0-.081.783h-1.36c0-.378.018-.696.058-.955a2.7 2.7 0 0 1 .183-.687c.085-.196.188-.369.309-.519a3.59 3.59 0 0 1 .434-.441l.385-.332a2.15 2.15 0 0 0 .327-.341c.098-.123.17-.264.228-.419.054-.155.081-.337.081-.551a1.5 1.5 0 0 0-.134-.66 1.388 1.388 0 0 0-.322-.441 1.35 1.35 0 0 0-.403-.246 1.17 1.17 0 0 0-.376-.077c-.519 0-.904.173-1.15.519-.246.346-.371.81-.371 1.392H8.962c0-.469.067-.896.206-1.283a2.641 2.641 0 0 1 1.561-1.619 3.33 3.33 0 0 1 1.253-.223c.385 0 .743.059 1.078.173.331.114.622.282.868.5.246.218.443.487.586.814a2.7 2.7 0 0 1 .215 1.101c-.009.305-.04.564-.103.783z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
- <path d="m 19,3 0,14 c 0,2.125 -1.911,4 -4,4 L 5,21 5,3 z m -7.644,13.572 1.687,0 0,-1.601 -1.687,0 z M 9.374,10.571 c 0.063,0.218 0.148,0.405 0.251,0.564 0.103,0.159 0.224,0.3 0.358,0.423 l 0.403,0.364 0.438,0.396 c 0.134,0.127 0.251,0.273 0.353,0.428 0.103,0.159 0.179,0.346 0.233,0.555 0.054,0.214 0.081,0.473 0.081,0.783 l 1.36,0 c 0,-0.378 -0.018,-0.696 -0.058,-0.955 C 12.757,12.87 12.695,12.642 12.61,12.442 12.525,12.246 12.422,12.073 12.301,11.923 12.18,11.773 12.033,11.627 11.867,11.482 L 11.482,11.15 c -0.121,-0.105 -0.233,-0.214 -0.327,-0.341 -0.098,-0.123 -0.17,-0.264 -0.228,-0.419 -0.054,-0.155 -0.081,-0.337 -0.081,-0.551 0,-0.255 0.045,-0.478 0.134,-0.66 0.089,-0.182 0.197,-0.332 0.322,-0.441 0.125,-0.109 0.26,-0.191 0.403,-0.246 0.143,-0.05 0.268,-0.077 0.376,-0.077 0.519,0 0.904,0.173 1.15,0.519 0.246,0.346 0.371,0.81 0.371,1.392 l 1.436,0 C 15.038,9.857 14.971,9.43 14.832,9.043 14.693,8.661 14.492,8.329 14.228,8.056 13.964,7.783 13.646,7.569 13.271,7.424 12.9,7.274 12.479,7.201 12.018,7.201 11.633,7.201 11.275,7.26 10.94,7.374 10.609,7.488 10.318,7.656 10.072,7.874 9.826,8.092 9.629,8.361 9.486,8.688 9.343,9.011 9.271,9.38 9.271,9.789 c 0.009,0.305 0.04,0.564 0.103,0.783 z"/>
+ <path d="M19 3v14c0 2.125-1.911 4-4 4H5V3zm-7.644 13.572h1.687v-1.601h-1.687zm-1.982-6.001a2.106 2.106 0 0 0 .609.987l.403.364.438.396c.134.127.251.273.353.428.103.159.179.346.233.555.054.214.081.473.081.783h1.36c0-.378-.018-.696-.058-.955a2.7 2.7 0 0 0-.183-.687 2.242 2.242 0 0 0-.309-.519 3.59 3.59 0 0 0-.434-.441l-.385-.332a2.15 2.15 0 0 1-.327-.341 1.513 1.513 0 0 1-.228-.419 1.671 1.671 0 0 1-.081-.551 1.5 1.5 0 0 1 .134-.66c.089-.182.197-.332.322-.441a1.35 1.35 0 0 1 .403-.246 1.17 1.17 0 0 1 .376-.077c.519 0 .904.173 1.15.519.246.346.371.81.371 1.392h1.436a3.77 3.77 0 0 0-.206-1.283 2.641 2.641 0 0 0-1.561-1.619 3.33 3.33 0 0 0-1.253-.223c-.385 0-.743.059-1.078.173a2.548 2.548 0 0 0-.868.5 2.304 2.304 0 0 0-.586.814 2.7 2.7 0 0 0-.215 1.101c.009.305.04.564.103.783z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
- <path d="m 5,3 0,14 c 0,2.552 1.516,4 4,4 L 19,21 19,3 5,3 z m 9.375,3.78125 c 1.383569,0 2.655397,1.2079253 2.78125,2.625 0,0.83766 -0.373613,1.545585 -0.9375,2.125 l -1.65625,1.6875 c -0.438035,0.517306 -1.120698,0.8125 -1.875,0.8125 -1.132679,0 -1.902838,-0.689468 -2.40625,-1.65625 l 0.8125,-0.84375 c 0.312181,0.708538 0.776094,1.28125 1.65625,1.28125 0.37756,0 0.873293,-0.178438 1.125,-0.4375 l 1.65625,-1.6875 c 0.629266,-0.646428 0.629266,-1.666072 0,-2.3125 C 15.219068,8.1167557 14.75256,7.90625 14.375,7.90625 13.619881,7.90625 13.127595,8.4826941 12.625,9 12.312818,8.8708781 11.999682,8.84375 11.6875,8.84375 c -0.186328,0 -0.374147,0.03125 -0.5,0.03125 0.941448,-0.9046723 1.868493,-2.09375 3.1875,-2.09375 z M 11.09375,9.5625 c 1.132679,0 1.902837,0.720724 2.40625,1.6875 l -0.8125,0.8125 c -0.312182,-0.646428 -0.744844,-1.28125 -1.625,-1.28125 -0.37756,0 -0.873293,0.209689 -1.125,0.46875 l -1.65625,1.65625 c -0.6292663,0.579415 -0.6292663,1.666072 0,2.3125 0.3121814,0.258245 0.7474402,0.46875 1.125,0.46875 0.3775597,0 0.873293,-0.209688 1.125,-0.46875 l 0.5625,-0.59375 c 0.251706,0.12912 0.500318,0.15625 0.8125,0.15625 0.186328,0 0.376171,-3.9e-4 0.5625,-0.0625 L 11.3125,15.9375 c -0.941447,1.096721 -2.711924,1.033794 -3.71875,0 -1.0673009,-1.033795 -1.0673009,-2.774192 0,-3.875 l 1.625,-1.65625 C 9.6567847,9.8889443 10.339448,9.5625 11.09375,9.5625 z"/>
+ <path d="M5 3v14c0 2.552 1.516 4 4 4h10V3H5zm9.375 3.781c1.384 0 2.655 1.208 2.781 2.625 0 .838-.373 1.546-.937 2.125l-1.657 1.688c-.438.517-1.12.812-1.874.812-1.133 0-1.903-.69-2.407-1.656l.813-.844c.312.709.776 1.281 1.656 1.281.378 0 .873-.178 1.125-.437l1.656-1.688a1.65 1.65 0 0 0 0-2.312c-.312-.258-.778-.469-1.156-.469-.755 0-1.247.577-1.75 1.094-.312-.13-.625-.156-.938-.156-.186 0-.374.031-.5.031.942-.905 1.869-2.094 3.188-2.094zm-3.281 2.782c1.132 0 1.903.72 2.406 1.687l-.813.813c-.312-.647-.744-1.282-1.624-1.282-.378 0-.874.21-1.126.469l-1.656 1.656c-.629.58-.629 1.666 0 2.313.312.258.748.469 1.125.469.378 0 .874-.21 1.125-.47l.563-.593c.251.13.5.156.812.156.187 0 .376 0 .563-.062l-1.156 1.219c-.942 1.096-2.712 1.033-3.72 0-1.067-1.034-1.067-2.775 0-3.876l1.626-1.656a2.454 2.454 0 0 1 1.875-.844z"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
- <path d="m 19,3 0,14 c 0,2.552 -1.516,4 -4,4 L 5,21 5,3 19,3 z M 9.625,6.78125 c -1.383569,0 -2.655397,1.2079253 -2.78125,2.625 0,0.83766 0.373613,1.545585 0.9375,2.125 l 1.65625,1.6875 c 0.438035,0.517306 1.120698,0.8125 1.875,0.8125 1.132679,0 1.902838,-0.689468 2.40625,-1.65625 l -0.8125,-0.84375 c -0.312181,0.708538 -0.776094,1.28125 -1.65625,1.28125 -0.37756,0 -0.873293,-0.178438 -1.125,-0.4375 L 8.46875,10.6875 C 7.839484,10.041072 7.839484,9.021428 8.46875,8.375 8.780932,8.1167557 9.24744,7.90625 9.625,7.90625 c 0.755119,0 1.247405,0.5764441 1.75,1.09375 0.312182,-0.1291219 0.625318,-0.15625 0.9375,-0.15625 0.186328,0 0.374147,0.03125 0.5,0.03125 C 11.871052,7.9703277 10.944007,6.78125 9.625,6.78125 z m 3.28125,2.78125 c -1.132679,0 -1.902837,0.720724 -2.40625,1.6875 l 0.8125,0.8125 c 0.312182,-0.646428 0.744844,-1.28125 1.625,-1.28125 0.37756,0 0.873293,0.209689 1.125,0.46875 l 1.65625,1.65625 c 0.629266,0.579415 0.629266,1.666072 0,2.3125 -0.312181,0.258245 -0.74744,0.46875 -1.125,0.46875 -0.37756,0 -0.873293,-0.209688 -1.125,-0.46875 L 12.90625,14.625 c -0.251706,0.12912 -0.500318,0.15625 -0.8125,0.15625 -0.186328,0 -0.376171,-3.9e-4 -0.5625,-0.0625 l 1.15625,1.21875 c 0.941447,1.096721 2.711924,1.033794 3.71875,0 1.067301,-1.033795 1.067301,-2.774192 0,-3.875 l -1.625,-1.65625 C 14.343215,9.8889443 13.660552,9.5625 12.90625,9.5625 z"/>
+ <path d="M19 3v14c0 2.552-1.516 4-4 4H5V3h14zM9.625 6.781c-1.384 0-2.655 1.208-2.781 2.625 0 .838.373 1.546.937 2.125l1.657 1.688c.438.517 1.12.812 1.874.812 1.133 0 1.903-.69 2.407-1.656l-.813-.844c-.312.709-.776 1.281-1.656 1.281-.378 0-.873-.178-1.125-.437l-1.656-1.688a1.652 1.652 0 0 1 0-2.312c.312-.258.778-.469 1.156-.469.755 0 1.247.577 1.75 1.094.312-.13.625-.156.938-.156.186 0 .374.031.5.031-.942-.905-1.869-2.094-3.188-2.094zm3.281 2.782c-1.132 0-1.903.72-2.406 1.687l.813.813c.312-.647.744-1.282 1.624-1.282.378 0 .874.21 1.126.469l1.656 1.656c.629.58.629 1.666 0 2.313-.312.258-.748.469-1.125.469-.378 0-.874-.21-1.125-.47l-.563-.593c-.251.13-.5.156-.812.156-.187 0-.376 0-.563-.062l1.156 1.219c.942 1.096 2.712 1.033 3.72 0 1.067-1.034 1.067-2.775 0-3.876l-1.626-1.656a2.454 2.454 0 0 0-1.875-.844z"/>
</svg>
!Array.isArray( descriptor.script )
) {
encodedScript = '{' +
- Object.keys( descriptor.script ).map( function ( key ) {
- var value = descriptor.script[ key ];
+ '"main":' + JSON.stringify( descriptor.script.main ) + ',' +
+ '"files":{' +
+ Object.keys( descriptor.script.files ).map( function ( key ) {
+ var value = descriptor.script.files[ key ];
return JSON.stringify( key ) + ':' +
( typeof value === 'function' ? value : JSON.stringify( value ) );
} ).join( ',' ) +
- '}';
+ '}}';
} else {
encodedScript = JSON.stringify( descriptor.script );
}
* @return array
*/
private function listTables() {
- global $wgCommentTableSchemaMigrationStage, $wgActorTableSchemaMigrationStage;
+ global $wgActorTableSchemaMigrationStage;
$tables = [ 'user', 'user_properties', 'user_former_groups', 'page', 'page_restrictions',
'protected_titles', 'revision', 'ip_changes', 'text', 'pagelinks', 'imagelinks',
'querycache', 'objectcache', 'job', 'l10n_cache', 'redirect', 'querycachetwo',
'archive', 'user_groups', 'page_props', 'category',
'slots', 'content', 'slot_roles', 'content_models',
+ 'comment', 'revision_comment_temp',
];
- if ( $wgCommentTableSchemaMigrationStage >= MIGRATION_WRITE_BOTH ) {
- // The new tables for comments are in use
- $tables[] = 'comment';
- $tables[] = 'revision_comment_temp';
- }
-
if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_NEW ) {
// The new tables for actors are in use
$tables[] = 'actor';
public static function provideInsertRoundTrip() {
$db = wfGetDB( DB_REPLICA ); // for timestamps
- $ipbfields = [
- ];
- $revfields = [
- ];
+ $comment = MediaWikiServices::getInstance()->getCommentStore()
+ ->createComment( wfGetDB( DB_MASTER ), '' );
return [
'recentchanges' => [ 'recentchanges', 'rc_user', 'rc_id', [
'rc_this_oldid' => 42,
'rc_last_oldid' => 41,
'rc_source' => 'test',
+ 'rc_comment_id' => $comment->id,
] ],
'ipblocks' => [ 'ipblocks', 'ipb_by', 'ipb_id', [
'ipb_range_start' => '',
'ipb_range_end' => '',
'ipb_timestamp' => $db->timestamp(),
'ipb_expiry' => $db->getInfinity(),
+ 'ipb_reason_id' => $comment->id,
] ],
'revision' => [ 'revision', 'rev_user', 'rev_id', [
'rev_page' => 42,
$block->delete();
}
+ /**
+ * @covers Block::prevents
+ */
+ public function testBlockAllowsPurge() {
+ $block = new Block();
+ $this->assertFalse( $block->prevents( 'purge' ) );
+ }
+
}
'comment',
];
+ protected function getSchemaOverrides( IMaintainableDatabase $db ) {
+ return [
+ 'scripts' => [
+ __DIR__ . '/CommentStoreTest.sql',
+ ],
+ 'drop' => [],
+ 'create' => [ 'commentstore1', 'commentstore2', 'commentstore2_temp' ],
+ 'alter' => [],
+ ];
+ }
+
/**
* Create a store for a particular stage
* @param int $stage
*/
protected function makeStore( $stage ) {
$store = new CommentStore( MediaWikiServices::getInstance()->getContentLanguage(), $stage );
+
+ TestingAccessWrapper::newFromObject( $store )->tempTables += [ 'cs2_comment' => [
+ 'table' => 'commentstore2_temp',
+ 'pk' => 'cs2t_id',
+ 'field' => 'cs2t_comment_id',
+ 'joinPK' => 'cs2_id',
+ 'stage' => MIGRATION_OLD,
+ 'deprecatedIn' => null,
+ ] ];
+
return $store;
}
$this->hideDeprecated( 'CommentStore::newKey' );
$store = CommentStore::newKey( $key );
TestingAccessWrapper::newFromObject( $store )->stage = $stage;
+
+ TestingAccessWrapper::newFromObject( $store )->tempTables += [ 'cs2_comment' => [
+ 'table' => 'commentstore2_temp',
+ 'pk' => 'cs2t_id',
+ 'field' => 'cs2t_comment_id',
+ 'joinPK' => 'cs2_id',
+ 'stage' => MIGRATION_OLD,
+ 'deprecatedIn' => null,
+ ] ];
+
return $store;
}
* @param string $table
* @param string $key
* @param string $pk
- * @param string $extraFields
* @param string|Message $comment
* @param array|null $data
* @param array $expect
*/
- public function testInsertRoundTrip( $table, $key, $pk, $extraFields, $comment, $data, $expect ) {
+ public function testInsertRoundTrip( $table, $key, $pk, $comment, $data, $expect ) {
+ static $id = 1;
+
$expectOld = [
'text' => $expect['text'],
'message' => new RawMessage( '$1', [ $expect['text'] ] ),
];
foreach ( $stages as $writeStage => $possibleReadStages ) {
- if ( $key === 'ipb_reason' ) {
- $extraFields['ipb_address'] = __CLASS__ . "#$writeStage";
- }
-
$wstore = $this->makeStore( $writeStage );
- $usesTemp = $key === 'rev_comment';
+ $usesTemp = $key === 'cs2_comment';
if ( $usesTemp ) {
list( $fields, $callback ) = $wstore->insertWithTempTable(
$this->assertArrayNotHasKey( "{$key}_id", $fields, "new field, stage=$writeStage" );
}
- $this->db->insert( $table, $extraFields + $fields, __METHOD__ );
- $id = $this->db->insertId();
+ $this->db->insert( $table, [ $pk => ++$id ] + $fields, __METHOD__ );
if ( $usesTemp ) {
$callback( $id );
}
* @param string $table
* @param string $key
* @param string $pk
- * @param string $extraFields
* @param string|Message $comment
* @param array|null $data
* @param array $expect
*/
public function testInsertRoundTrip_withKeyConstruction(
- $table, $key, $pk, $extraFields, $comment, $data, $expect
+ $table, $key, $pk, $comment, $data, $expect
) {
+ static $id = 1000;
+
$expectOld = [
'text' => $expect['text'],
'message' => new RawMessage( '$1', [ $expect['text'] ] ),
];
foreach ( $stages as $writeStage => $possibleReadStages ) {
- if ( $key === 'ipb_reason' ) {
- $extraFields['ipb_address'] = __CLASS__ . "#$writeStage";
- }
-
$wstore = $this->makeStoreWithKey( $writeStage, $key );
- $usesTemp = $key === 'rev_comment';
+ $usesTemp = $key === 'cs2_comment';
if ( $usesTemp ) {
list( $fields, $callback ) = $wstore->insertWithTempTable(
$this->assertArrayNotHasKey( "{$key}_id", $fields, "new field, stage=$writeStage" );
}
- $this->db->insert( $table, $extraFields + $fields, __METHOD__ );
- $id = $this->db->insertId();
+ $this->db->insert( $table, [ $pk => ++$id ] + $fields, __METHOD__ );
if ( $usesTemp ) {
$callback( $id );
}
$msgComment = new Message( 'parentheses', [ 'message comment' ] );
$textCommentMsg = new RawMessage( '$1', [ 'text comment' ] );
$nestedMsgComment = new Message( [ 'parentheses', 'rawmessage' ], [ new Message( 'mainpage' ) ] );
- $ipbfields = [
- 'ipb_range_start' => '',
- 'ipb_range_end' => '',
- 'ipb_timestamp' => $db->timestamp(),
- 'ipb_expiry' => $db->getInfinity(),
- ];
- $revfields = [
- 'rev_page' => 42,
- 'rev_text_id' => 42,
- 'rev_len' => 0,
- 'rev_timestamp' => $db->timestamp(),
- ];
$comStoreComment = new CommentStoreComment(
null, 'comment store comment', null, [ 'foo' => 'bar' ]
);
return [
'Simple table, text comment' => [
- 'ipblocks', 'ipb_reason', 'ipb_id', $ipbfields, 'text comment', null, [
+ 'commentstore1', 'cs1_comment', 'cs1_id', 'text comment', null, [
'text' => 'text comment',
'message' => $textCommentMsg,
'data' => null,
]
],
'Simple table, text comment with data' => [
- 'ipblocks', 'ipb_reason', 'ipb_id', $ipbfields, 'text comment', [ 'message' => 42 ], [
+ 'commentstore1', 'cs1_comment', 'cs1_id', 'text comment', [ 'message' => 42 ], [
'text' => 'text comment',
'message' => $textCommentMsg,
'data' => [ 'message' => 42 ],
]
],
'Simple table, message comment' => [
- 'ipblocks', 'ipb_reason', 'ipb_id', $ipbfields, $msgComment, null, [
+ 'commentstore1', 'cs1_comment', 'cs1_id', $msgComment, null, [
'text' => '(message comment)',
'message' => $msgComment,
'data' => null,
]
],
'Simple table, message comment with data' => [
- 'ipblocks', 'ipb_reason', 'ipb_id', $ipbfields, $msgComment, [ 'message' => 42 ], [
+ 'commentstore1', 'cs1_comment', 'cs1_id', $msgComment, [ 'message' => 42 ], [
'text' => '(message comment)',
'message' => $msgComment,
'data' => [ 'message' => 42 ],
]
],
'Simple table, nested message comment' => [
- 'ipblocks', 'ipb_reason', 'ipb_id', $ipbfields, $nestedMsgComment, null, [
+ 'commentstore1', 'cs1_comment', 'cs1_id', $nestedMsgComment, null, [
'text' => '(Main Page)',
'message' => $nestedMsgComment,
'data' => null,
]
],
'Simple table, CommentStoreComment' => [
- 'ipblocks', 'ipb_reason', 'ipb_id', $ipbfields, clone $comStoreComment, [ 'baz' => 'baz' ], [
+ 'commentstore1', 'cs1_comment', 'cs1_id', clone $comStoreComment, [ 'baz' => 'baz' ], [
'text' => 'comment store comment',
'message' => $comStoreComment->message,
'data' => [ 'foo' => 'bar' ],
],
'Revision, text comment' => [
- 'revision', 'rev_comment', 'rev_id', $revfields, 'text comment', null, [
+ 'commentstore2', 'cs2_comment', 'cs2_id', 'text comment', null, [
'text' => 'text comment',
'message' => $textCommentMsg,
'data' => null,
]
],
'Revision, text comment with data' => [
- 'revision', 'rev_comment', 'rev_id', $revfields, 'text comment', [ 'message' => 42 ], [
+ 'commentstore2', 'cs2_comment', 'cs2_id', 'text comment', [ 'message' => 42 ], [
'text' => 'text comment',
'message' => $textCommentMsg,
'data' => [ 'message' => 42 ],
]
],
'Revision, message comment' => [
- 'revision', 'rev_comment', 'rev_id', $revfields, $msgComment, null, [
+ 'commentstore2', 'cs2_comment', 'cs2_id', $msgComment, null, [
'text' => '(message comment)',
'message' => $msgComment,
'data' => null,
]
],
'Revision, message comment with data' => [
- 'revision', 'rev_comment', 'rev_id', $revfields, $msgComment, [ 'message' => 42 ], [
+ 'commentstore2', 'cs2_comment', 'cs2_id', $msgComment, [ 'message' => 42 ], [
'text' => '(message comment)',
'message' => $msgComment,
'data' => [ 'message' => 42 ],
]
],
'Revision, nested message comment' => [
- 'revision', 'rev_comment', 'rev_id', $revfields, $nestedMsgComment, null, [
+ 'commentstore2', 'cs2_comment', 'cs2_id', $nestedMsgComment, null, [
'text' => '(Main Page)',
'message' => $nestedMsgComment,
'data' => null,
]
],
'Revision, CommentStoreComment' => [
- 'revision', 'rev_comment', 'rev_id', $revfields, clone $comStoreComment, [ 'baz' => 'baz' ], [
+ 'commentstore2', 'cs2_comment', 'cs2_id', clone $comStoreComment, [ 'baz' => 'baz' ], [
'text' => 'comment store comment',
'message' => $comStoreComment->message,
'data' => [ 'foo' => 'bar' ],
--- /dev/null
+-- These are carefully crafted to work in all five supported databases
+
+CREATE TABLE /*_*/commentstore1 (
+ cs1_id integer not null,
+ cs1_comment varchar(200),
+ cs1_comment_id integer
+);
+
+CREATE TABLE /*_*/commentstore2 (
+ cs2_id integer not null,
+ cs2_comment varchar(200)
+);
+
+CREATE TABLE /*_*/commentstore2_temp (
+ cs2t_id integer not null,
+ cs2t_comment_id integer
+);
return $fields;
}
- protected function getOldCommentQueryFields( $prefix ) {
- return [
- "{$prefix}_comment_text" => "{$prefix}_comment",
- "{$prefix}_comment_data" => 'NULL',
- "{$prefix}_comment_cid" => 'NULL',
- ];
- }
-
- protected function getCompatCommentQueryFields( $prefix ) {
- return [
- "{$prefix}_comment_text"
- => "COALESCE( comment_{$prefix}_comment.comment_text, {$prefix}_comment )",
- "{$prefix}_comment_data" => "comment_{$prefix}_comment.comment_data",
- "{$prefix}_comment_cid" => "comment_{$prefix}_comment.comment_id",
- ];
- }
-
protected function getNewCommentQueryFields( $prefix ) {
return [
"{$prefix}_comment_text" => "comment_{$prefix}_comment.comment_text",
];
}
- protected function getCompatCommentJoins( $prefix ) {
- return [
- "temp_{$prefix}_comment" => [
- "LEFT JOIN",
- "temp_{$prefix}_comment.revcomment_{$prefix} = {$prefix}_id",
- ],
- "comment_{$prefix}_comment" => [
- "LEFT JOIN",
- "comment_{$prefix}_comment.comment_id = temp_{$prefix}_comment.revcomment_comment_id",
- ],
- ];
- }
-
protected function getTextQueryFields() {
return [
'old_text',
yield 'MCR, comment, actor' => [
[
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_NEW,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_NEW,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_NEW,
],
[
'wgContentHandlerUseDB' => true,
'wgMultiContentRevisionSchemaMigrationStage'
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_NEW,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_NEW,
],
[
'fields' => array_merge(
$this->getArchiveQueryFields( false ),
$this->getNewActorQueryFields( 'ar' ),
- $this->getCompatCommentQueryFields( 'ar' )
+ $this->getNewCommentQueryFields( 'ar' )
),
'joins' => [
'comment_ar_comment'
- => [ 'LEFT JOIN', 'comment_ar_comment.comment_id = ar_comment_id' ],
+ => [ 'JOIN', 'comment_ar_comment.comment_id = ar_comment_id' ],
'actor_ar_user' => [ 'JOIN', 'actor_ar_user.actor_id = ar_actor' ],
],
]
'wgContentHandlerUseDB' => true,
'wgMultiContentRevisionSchemaMigrationStage'
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
],
[
$this->getArchiveQueryFields( true ),
$this->getContentHandlerQueryFields( 'ar' ),
$this->getOldActorQueryFields( 'ar' ),
- $this->getCompatCommentQueryFields( 'ar' )
+ $this->getNewCommentQueryFields( 'ar' )
),
'joins' => [
'comment_ar_comment'
- => [ 'LEFT JOIN', 'comment_ar_comment.comment_id = ar_comment_id' ],
+ => [ 'JOIN', 'comment_ar_comment.comment_id = ar_comment_id' ],
],
]
];
[
'wgContentHandlerUseDB' => false,
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
],
[
'tables' => [
'archive',
+ 'comment_ar_comment' => 'comment',
],
'fields' => array_merge(
$this->getArchiveQueryFields( true ),
$this->getOldActorQueryFields( 'ar' ),
- $this->getOldCommentQueryFields( 'ar' )
+ $this->getNewCommentQueryFields( 'ar' )
),
- 'joins' => [],
+ 'joins' => [
+ 'comment_ar_comment'
+ => [ 'JOIN', 'comment_ar_comment.comment_id = ar_comment_id' ],
+ ],
]
];
}
[
'wgContentHandlerUseDB' => true,
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_NEW,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_NEW,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_NEW,
],
[ 'page', 'user' ],
'wgContentHandlerUseDB' => true,
'wgMultiContentRevisionSchemaMigrationStage'
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_NEW,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW,
],
[ 'page', 'user' ],
$this->getPageQueryFields(),
$this->getUserQueryFields(),
$this->getNewActorQueryFields( 'rev', 'temp_rev_user.revactor_actor' ),
- $this->getCompatCommentQueryFields( 'rev' )
+ $this->getNewCommentQueryFields( 'rev' )
),
'joins' => array_merge(
[
'user_id = actor_rev_user.actor_user',
]
],
+ 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
+ 'comment_rev_comment'
+ => [ 'JOIN', 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id' ],
],
- $this->getNewActorJoins( 'rev' ),
- $this->getCompatCommentJoins( 'rev' )
+ $this->getNewActorJoins( 'rev' )
),
]
];
'wgContentHandlerUseDB' => true,
'wgMultiContentRevisionSchemaMigrationStage'
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_NEW,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW,
],
[ 'page', 'user' ],
$this->getPageQueryFields(),
$this->getUserQueryFields(),
$this->getNewActorQueryFields( 'rev', 'temp_rev_user.revactor_actor' ),
- $this->getCompatCommentQueryFields( 'rev' )
+ $this->getNewCommentQueryFields( 'rev' )
),
'joins' => array_merge(
[
'user_id = actor_rev_user.actor_user'
]
],
+ 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
+ 'comment_rev_comment'
+ => [ 'JOIN', 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id' ],
],
- $this->getNewActorJoins( 'rev' ),
- $this->getCompatCommentJoins( 'rev' )
+ $this->getNewActorJoins( 'rev' )
),
]
];
'wgContentHandlerUseDB' => true,
'wgMultiContentRevisionSchemaMigrationStage'
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
],
[],
$this->getRevisionQueryFields( true ),
$this->getContentHandlerQueryFields( 'rev' ),
$this->getOldActorQueryFields( 'rev', 'temp_rev_user.revactor_actor' ),
- $this->getCompatCommentQueryFields( 'rev' )
+ $this->getNewCommentQueryFields( 'rev' )
),
- 'joins' => array_merge(
- $this->getCompatCommentJoins( 'rev' )
- ),
+ 'joins' => [
+ 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
+ 'comment_rev_comment'
+ => [ 'JOIN', 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id' ],
+ ],
]
];
yield 'MCR write-both/read-old, page, user' => [
'wgContentHandlerUseDB' => true,
'wgMultiContentRevisionSchemaMigrationStage'
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
],
[ 'page', 'user' ],
$this->getUserQueryFields(),
$this->getPageQueryFields(),
$this->getOldActorQueryFields( 'rev', 'temp_rev_user.revactor_actor' ),
- $this->getCompatCommentQueryFields( 'rev' )
+ $this->getNewCommentQueryFields( 'rev' )
),
'joins' => array_merge(
[
'user_id = rev_user'
]
],
- ],
- $this->getCompatCommentJoins( 'rev' )
+ 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
+ 'comment_rev_comment'
+ => [ 'JOIN', 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id' ],
+ ]
),
]
];
[
'wgContentHandlerUseDB' => true,
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
],
[],
[
- 'tables' => [ 'revision' ],
+ 'tables' => [
+ 'revision',
+ 'temp_rev_comment' => 'revision_comment_temp',
+ 'comment_rev_comment' => 'comment',
+ ],
'fields' => array_merge(
$this->getRevisionQueryFields( true ),
$this->getContentHandlerQueryFields( 'rev' ),
$this->getOldActorQueryFields( 'rev' ),
- $this->getOldCommentQueryFields( 'rev' )
+ $this->getNewCommentQueryFields( 'rev' )
),
- 'joins' => [],
+ 'joins' => [
+ 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
+ 'comment_rev_comment'
+ => [ 'JOIN', 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id' ],
+ ],
]
];
yield 'pre-MCR, page, user' => [
[
'wgContentHandlerUseDB' => true,
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
],
[ 'page', 'user' ],
[
- 'tables' => [ 'revision', 'page', 'user' ],
+ 'tables' => [
+ 'revision', 'page', 'user',
+ 'temp_rev_comment' => 'revision_comment_temp',
+ 'comment_rev_comment' => 'comment',
+ ],
'fields' => array_merge(
$this->getRevisionQueryFields( true ),
$this->getContentHandlerQueryFields( 'rev' ),
$this->getPageQueryFields(),
$this->getUserQueryFields(),
$this->getOldActorQueryFields( 'rev' ),
- $this->getOldCommentQueryFields( 'rev' )
+ $this->getNewCommentQueryFields( 'rev' )
),
'joins' => [
'page' => [ 'INNER JOIN', [ 'page_id = rev_page' ] ],
'user' => [ 'LEFT JOIN', [ 'rev_user != 0', 'user_id = rev_user' ] ],
+ 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
+ 'comment_rev_comment'
+ => [ 'JOIN', 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id' ],
],
]
];
[
'wgContentHandlerUseDB' => false,
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
],
[],
[
- 'tables' => [ 'revision' ],
+ 'tables' => [
+ 'revision',
+ 'temp_rev_comment' => 'revision_comment_temp',
+ 'comment_rev_comment' => 'comment',
+ ],
'fields' => array_merge(
$this->getRevisionQueryFields( true ),
$this->getOldActorQueryFields( 'rev' ),
- $this->getOldCommentQueryFields( 'rev' )
+ $this->getNewCommentQueryFields( 'rev' )
),
- 'joins' => [],
+ 'joins' => [
+ 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
+ 'comment_rev_comment'
+ => [ 'JOIN', 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id' ],
+ ],
],
];
yield 'pre-MCR, no model, page' => [
[
'wgContentHandlerUseDB' => false,
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
],
[ 'page' ],
[
- 'tables' => [ 'revision', 'page' ],
+ 'tables' => [
+ 'revision', 'page',
+ 'temp_rev_comment' => 'revision_comment_temp',
+ 'comment_rev_comment' => 'comment',
+ ],
'fields' => array_merge(
$this->getRevisionQueryFields( true ),
$this->getPageQueryFields(),
$this->getOldActorQueryFields( 'rev' ),
- $this->getOldCommentQueryFields( 'rev' )
+ $this->getNewCommentQueryFields( 'rev' )
),
'joins' => [
'page' => [ 'INNER JOIN', [ 'page_id = rev_page' ], ],
+ 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
+ 'comment_rev_comment'
+ => [ 'JOIN', 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id' ],
],
],
];
[
'wgContentHandlerUseDB' => false,
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
],
[ 'user' ],
[
- 'tables' => [ 'revision', 'user' ],
+ 'tables' => [
+ 'revision', 'user',
+ 'temp_rev_comment' => 'revision_comment_temp',
+ 'comment_rev_comment' => 'comment',
+ ],
'fields' => array_merge(
$this->getRevisionQueryFields( true ),
$this->getUserQueryFields(),
$this->getOldActorQueryFields( 'rev' ),
- $this->getOldCommentQueryFields( 'rev' )
+ $this->getNewCommentQueryFields( 'rev' )
),
'joins' => [
'user' => [ 'LEFT JOIN', [ 'rev_user != 0', 'user_id = rev_user' ] ],
+ 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
+ 'comment_rev_comment'
+ => [ 'JOIN', 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id' ],
],
],
];
[
'wgContentHandlerUseDB' => false,
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
],
[ 'text' ],
[
- 'tables' => [ 'revision', 'text' ],
+ 'tables' => [
+ 'revision', 'text',
+ 'temp_rev_comment' => 'revision_comment_temp',
+ 'comment_rev_comment' => 'comment',
+ ],
'fields' => array_merge(
$this->getRevisionQueryFields( true ),
$this->getTextQueryFields(),
$this->getOldActorQueryFields( 'rev' ),
- $this->getOldCommentQueryFields( 'rev' )
+ $this->getNewCommentQueryFields( 'rev' )
),
'joins' => [
'text' => [ 'INNER JOIN', [ 'rev_text_id=old_id' ] ],
+ 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
+ 'comment_rev_comment'
+ => [ 'JOIN', 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id' ],
],
],
];
[
'wgContentHandlerUseDB' => false,
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
],
[ 'text', 'page', 'user' ],
[
'tables' => [
- 'revision', 'page', 'user', 'text'
+ 'revision', 'page', 'user', 'text',
+ 'temp_rev_comment' => 'revision_comment_temp',
+ 'comment_rev_comment' => 'comment',
],
'fields' => array_merge(
$this->getRevisionQueryFields( true ),
$this->getUserQueryFields(),
$this->getTextQueryFields(),
$this->getOldActorQueryFields( 'rev' ),
- $this->getOldCommentQueryFields( 'rev' )
+ $this->getNewCommentQueryFields( 'rev' )
),
'joins' => [
'page' => [
'INNER JOIN',
[ 'rev_text_id=old_id' ],
],
+ 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
+ 'comment_rev_comment'
+ => [ 'JOIN', 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id' ],
],
],
];
yield 'with model, comment, and actor' => [
[
'wgContentHandlerUseDB' => true,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
],
'fields' => array_merge(
],
$this->getContentHandlerQueryFields( 'rev' ),
[
- 'rev_comment_old' => 'rev_comment',
'rev_comment_pk' => 'rev_id',
]
),
yield 'no mode, no comment, no actor' => [
[
'wgContentHandlerUseDB' => false,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
],
'fields' => array_merge(
'rev_len',
'rev_parent_id',
'rev_sha1',
- ],
- $this->getOldCommentQueryFields( 'rev' )
+ 'rev_comment_pk' => 'rev_id',
+ ]
),
];
}
yield 'with model, comment, and actor' => [
[
'wgContentHandlerUseDB' => true,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
],
'fields' => array_merge(
],
$this->getContentHandlerQueryFields( 'ar' ),
[
- 'ar_comment_old' => 'ar_comment',
'ar_comment_id' => 'ar_comment_id',
]
),
yield 'no mode, no comment, no actor' => [
[
'wgContentHandlerUseDB' => false,
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
],
'fields' => array_merge(
'ar_len',
'ar_parent_id',
'ar_sha1',
- ],
- $this->getOldCommentQueryFields( 'ar' )
+ 'ar_comment_id' => 'ar_comment_id',
+ ]
),
];
}
<?php
-// phpcs:disable MediaWiki.Commenting.PhpunitAnnotations.NotClassTrait
+// phpcs:disable MediaWiki.Commenting.PhpunitAnnotations.NotClass
namespace MediaWiki\Tests\Revision;
*
* @return RevisionRecord
*/
- protected abstract function newRevision( array $rowOverrides = [] );
+ abstract protected function newRevision( array $rowOverrides = [] );
private function provideAudienceCheckData( $field ) {
yield 'field accessible for oversighter (ALL)' => [
$this->setMwGlobals( [
'wgMultiContentRevisionSchemaMigrationStage' => $this->getMcrMigrationStage(),
'wgContentHandlerUseDB' => $this->getContentHandlerUseDB(),
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_NEW,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
] );
$this->setMwGlobals( [
'wgMultiContentRevisionSchemaMigrationStage' => $this->getMcrMigrationStage(),
'wgContentHandlerUseDB' => $this->getContentHandlerUseDB(),
- 'wgCommentTableSchemaMigrationStage' => MIGRATION_NEW,
'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
] );
* @covers \MediaWiki\Revision\RevisionStore::newMutableRevisionFromArray
*/
public function testConstructFromRowWithBadPageId() {
- $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_NEW );
$this->overrideMwServices();
Wikimedia\suppressWarnings();
$rev = new Revision( (object)[
* @covers Revision::loadFromTitle
*/
public function testLoadFromTitle() {
- $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_NEW );
$this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_OLD );
$this->overrideMwServices();
$title = $this->getMockTitle();
/**
* @dataProvider provideGetWikiIdFromDomain
- * @covers WikiMap::getWikiIdFromDomain()
+ * @covers WikiMap::getWikiIdFromDbDomain()
*/
public function testGetWikiIdFromDomain( $domain, $wikiId ) {
- $this->assertEquals( $wikiId, WikiMap::getWikiIdFromDomain( $domain ) );
+ $this->assertEquals( $wikiId, WikiMap::getWikiIdFromDbDomain( $domain ) );
}
/**
- * @covers WikiMap::isCurrentWikiDomain()
- * @covers WikiMap::getCurrentWikiDomain()
+ * @covers WikiMap::isCurrentWikiDbDomain()
+ * @covers WikiMap::getCurrentWikiDbDomain()
*/
public function testIsCurrentWikiDomain() {
- $this->assertTrue( WikiMap::isCurrentWikiDomain( wfWikiID() ) );
+ $this->assertTrue( WikiMap::isCurrentWikiDbDomain( wfWikiID() ) );
$localDomain = DatabaseDomain::newFromId( wfWikiID() );
$domain1 = new DatabaseDomain(
$domain2 = new DatabaseDomain(
$localDomain->getDatabase(), null, $localDomain->getTablePrefix() );
- $this->assertTrue( WikiMap::isCurrentWikiDomain( $domain1 ), 'Schema ignored' );
- $this->assertTrue( WikiMap::isCurrentWikiDomain( $domain2 ), 'Schema ignored' );
+ $this->assertTrue( WikiMap::isCurrentWikiDbDomain( $domain1 ), 'Schema ignored' );
+ $this->assertTrue( WikiMap::isCurrentWikiDbDomain( $domain2 ), 'Schema ignored' );
- $this->assertTrue( WikiMap::isCurrentWikiDomain( WikiMap::getCurrentWikiDomain() ) );
+ $this->assertTrue( WikiMap::isCurrentWikiDbDomain( WikiMap::getCurrentWikiDbDomain() ) );
}
public function provideIsCurrentWikiId() {
/**
* @dataProvider provideIsCurrentWikiId
* @covers WikiMap::isCurrentWikiId()
- * @covers WikiMap::getCurrentWikiDomain()
- * @covers WikiMap::getWikiIdFromDomain()
+ * @covers WikiMap::getCurrentWikiDbDomain()
+ * @covers WikiMap::getWikiIdFromDbDomain()
*/
public function testIsCurrentWikiId( $wikiId, $db, $schema, $prefix ) {
$this->setMwGlobals(
'foo',
[ [ 'apiwarn-deprecation-parameter', 'myParam' ] ],
],
+ 'Deprecated parameter with default, unspecified' => [
+ null,
+ [ ApiBase::PARAM_DEPRECATED => true, ApiBase::PARAM_DFLT => 'foo' ],
+ 'foo',
+ [],
+ ],
+ 'Deprecated parameter with default, specified' => [
+ 'foo',
+ [ ApiBase::PARAM_DEPRECATED => true, ApiBase::PARAM_DFLT => 'foo' ],
+ 'foo',
+ [ [ 'apiwarn-deprecation-parameter', 'myParam' ] ],
+ ],
'Deprecated parameter value' => [
'a',
[ ApiBase::PARAM_DEPRECATED_VALUES => [ 'a' => true ] ],
'a',
[ [ 'apiwarn-deprecation-parameter', 'myParam=a' ] ],
],
+ 'Deprecated parameter value as default, unspecified' => [
+ null,
+ [ ApiBase::PARAM_DEPRECATED_VALUES => [ 'a' => true ], ApiBase::PARAM_DFLT => 'a' ],
+ 'a',
+ [],
+ ],
+ 'Deprecated parameter value as default, specified' => [
+ 'a',
+ [ ApiBase::PARAM_DEPRECATED_VALUES => [ 'a' => true ], ApiBase::PARAM_DFLT => 'a' ],
+ 'a',
+ [ [ 'apiwarn-deprecation-parameter', 'myParam=a' ] ],
+ ],
'Multiple deprecated parameter values' => [
'a|b|c|d',
[ ApiBase::PARAM_DEPRECATED_VALUES =>
/**
* @covers ParserOutput::addExternalLink
+ * @covers LinksUpdate::getAddedExternalLinks
+ * @covers LinksUpdate::getRemovedExternalLinks
*/
public function testUpdate_externallinks() {
/** @var ParserOutput $po */
$po->addExternalLink( "http://testing.com/wiki/Foo" );
- $this->assertLinksUpdate(
+ $update = $this->assertLinksUpdate(
$t,
$po,
'externallinks',
[ 'http://testing.com/wiki/Foo', 'http://com.testing./wiki/Foo' ],
]
);
+
+ $this->assertArrayEquals( [
+ "http://testing.com/wiki/Foo"
+ ], $update->getAddedExternalLinks() );
+
+ $po = new ParserOutput();
+ $po->setTitleText( $t->getPrefixedText() );
+ $po->addExternalLink( 'http://testing.com/wiki/Bar' );
+ $update = $this->assertLinksUpdate(
+ $t,
+ $po,
+ 'externallinks',
+ 'el_to, el_index',
+ 'el_from = ' . self::$testingPageId,
+ [
+ [ 'http://testing.com/wiki/Bar', 'http://com.testing./wiki/Bar' ],
+ ]
+ );
+
+ $this->assertArrayEquals( [
+ "http://testing.com/wiki/Bar"
+ ], $update->getAddedExternalLinks() );
+ $this->assertArrayEquals( [
+ "http://testing.com/wiki/Foo"
+ ], $update->getRemovedExternalLinks() );
}
/**
protected function assertRecentChangeByCategorization(
Title $pageTitle, ParserOutput $parserOutput, Title $categoryTitle, $expectedRows
) {
- global $wgCommentTableSchemaMigrationStage;
-
- if ( $wgCommentTableSchemaMigrationStage <= MIGRATION_WRITE_BOTH ) {
- $this->assertSelect(
- 'recentchanges',
- 'rc_title, rc_comment',
- [
- 'rc_type' => RC_CATEGORIZE,
- 'rc_namespace' => NS_CATEGORY,
- 'rc_title' => $categoryTitle->getDBkey()
- ],
- $expectedRows
- );
- }
- if ( $wgCommentTableSchemaMigrationStage >= MIGRATION_WRITE_BOTH ) {
- $this->assertSelect(
- [ 'recentchanges', 'comment' ],
- 'rc_title, comment_text',
- [
- 'rc_type' => RC_CATEGORIZE,
- 'rc_namespace' => NS_CATEGORY,
- 'rc_title' => $categoryTitle->getDBkey(),
- 'comment_id = rc_comment_id',
- ],
- $expectedRows
- );
- }
+ $this->assertSelect(
+ [ 'recentchanges', 'comment' ],
+ 'rc_title, comment_text',
+ [
+ 'rc_type' => RC_CATEGORIZE,
+ 'rc_namespace' => NS_CATEGORY,
+ 'rc_title' => $categoryTitle->getDBkey(),
+ 'comment_id = rc_comment_id',
+ ],
+ $expectedRows
+ );
}
private function runAllRelatedJobs() {
* @covers HTMLCheckMatrix
*/
class HTMLCheckMatrixTest extends MediaWikiTestCase {
- static private $defaultOptions = [
+ private static $defaultOptions = [
'rows' => [ 'r1', 'r2' ],
'columns' => [ 'c1', 'c2' ],
'fieldname' => 'test',
* @param array $selectFields
* @param string[]|null $row
* @param string[]|null $expectedFields
- * @param int $commentMigration
* @param int $actorMigration
*/
public function testNewFromId( $id,
array $selectFields,
array $row = null,
array $expectedFields = null,
- $commentMigration,
$actorMigration
) {
$this->setMwGlobals( [
- 'wgCommentTableSchemaMigrationStage' => $commentMigration,
'wgActorTableSchemaMigrationStage' => $actorMigration,
] );
public function provideNewFromId() {
$oldTables = [
- 'tables' => [ 'logging', 'user' ],
+ 'tables' => [
+ 'logging', 'user',
+ 'comment_log_comment' => 'comment',
+ ],
'fields' => [
'log_id',
'log_type',
'user_id',
'user_name',
'user_editcount',
- 'log_comment_text' => 'log_comment',
- 'log_comment_data' => 'NULL',
- 'log_comment_cid' => 'NULL',
+ 'log_comment_text' => 'comment_log_comment.comment_text',
+ 'log_comment_data' => 'comment_log_comment.comment_data',
+ 'log_comment_cid' => 'comment_log_comment.comment_id',
'log_user' => 'log_user',
'log_user_text' => 'log_user_text',
'log_actor' => 'NULL',
],
'options' => [],
- 'join_conds' => [ 'user' => [ 'LEFT JOIN', 'user_id=log_user' ] ],
+ 'join_conds' => [
+ 'user' => [ 'LEFT JOIN', 'user_id=log_user' ],
+ 'comment_log_comment' => [ 'JOIN', 'comment_log_comment.comment_id = log_comment_id' ],
+ ],
];
$newTables = [
'tables' => [
$oldTables + [ 'conds' => [ 'log_id' => 0 ] ],
null,
null,
- MIGRATION_OLD,
SCHEMA_COMPAT_OLD,
],
[
'log_comment_data' => null,
],
[ 'type' => 'foobarize', 'comment' => 'test!' ],
- MIGRATION_OLD,
SCHEMA_COMPAT_OLD,
],
[
'log_comment_data' => null,
],
[ 'type' => 'foobarize', 'comment' => 'test!' ],
- MIGRATION_NEW,
SCHEMA_COMPAT_NEW,
],
];
$this->tablesUsed += $this->getMcrTablesToReset();
- $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_NEW );
$this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_OLD );
$this->setMwGlobals( 'wgContentHandlerUseDB', $this->getContentHandlerUseDB() );
$this->setMwGlobals(
$this->assertTrue( $page->wasLoadedFrom( IDBAccessObject::READ_EXCLUSIVE ) );
}
- /**
- * @dataProvider provideCommentMigrationOnDeletion
- *
- * @param int $writeStage
- * @param int $readStage
- */
- public function testCommentMigrationOnDeletion( $writeStage, $readStage ) {
- $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', $writeStage );
- $this->overrideMwServices();
-
- $dbr = wfGetDB( DB_REPLICA );
-
- $page = $this->createPage(
- __METHOD__,
- "foo",
- CONTENT_MODEL_WIKITEXT
- );
- $revid = $page->getLatest();
- if ( $writeStage > MIGRATION_OLD ) {
- $comment_id = $dbr->selectField(
- 'revision_comment_temp',
- 'revcomment_comment_id',
- [ 'revcomment_rev' => $revid ],
- __METHOD__
- );
- }
-
- $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', $readStage );
- $this->overrideMwServices();
-
- $page->doDeleteArticle( "testing deletion" );
-
- if ( $readStage > MIGRATION_OLD ) {
- // Didn't leave behind any 'revision_comment_temp' rows
- $n = $dbr->selectField(
- 'revision_comment_temp', 'COUNT(*)', [ 'revcomment_rev' => $revid ], __METHOD__
- );
- $this->assertEquals( 0, $n, 'no entry in revision_comment_temp after deletion' );
-
- // Copied or upgraded the comment_id, as applicable
- $ar_comment_id = $dbr->selectField(
- 'archive',
- 'ar_comment_id',
- [ 'ar_rev_id' => $revid ],
- __METHOD__
- );
- if ( $writeStage > MIGRATION_OLD ) {
- $this->assertSame( $comment_id, $ar_comment_id );
- } else {
- $this->assertNotEquals( 0, $ar_comment_id );
- }
- }
-
- // Copied rev_comment, if applicable
- if ( $readStage <= MIGRATION_WRITE_BOTH && $writeStage <= MIGRATION_WRITE_BOTH ) {
- $ar_comment = $dbr->selectField(
- 'archive',
- 'ar_comment',
- [ 'ar_rev_id' => $revid ],
- __METHOD__
- );
- $this->assertSame( 'testing', $ar_comment );
- }
- }
-
- public function provideCommentMigrationOnDeletion() {
- return [
- [ MIGRATION_OLD, MIGRATION_OLD ],
- [ MIGRATION_OLD, MIGRATION_WRITE_BOTH ],
- [ MIGRATION_OLD, MIGRATION_WRITE_NEW ],
- [ MIGRATION_WRITE_BOTH, MIGRATION_OLD ],
- [ MIGRATION_WRITE_BOTH, MIGRATION_WRITE_BOTH ],
- [ MIGRATION_WRITE_BOTH, MIGRATION_WRITE_NEW ],
- [ MIGRATION_WRITE_BOTH, MIGRATION_NEW ],
- [ MIGRATION_WRITE_NEW, MIGRATION_WRITE_BOTH ],
- [ MIGRATION_WRITE_NEW, MIGRATION_WRITE_NEW ],
- [ MIGRATION_WRITE_NEW, MIGRATION_NEW ],
- [ MIGRATION_NEW, MIGRATION_WRITE_BOTH ],
- [ MIGRATION_NEW, MIGRATION_WRITE_NEW ],
- [ MIGRATION_NEW, MIGRATION_NEW ],
- ];
- }
-
/**
* @covers WikiPage::updateCategoryCounts
*/
<?php
class RemexDriverTest extends MediaWikiTestCase {
- static private $remexTidyTestData = [
+ private static $remexTidyTestData = [
// Tests from Html5Depurate
[
'Empty string',
$dbw = wfGetDB( DB_MASTER );
$logs = [];
+ $comment = \MediaWiki\MediaWikiServices::getInstance()->getCommentStore()
+ ->createComment( $dbw, '' );
+
// Manual patrolling
$logs[] = [
'log_type' => 'patrol',
'log_timestamp' => $dbw->timestamp( '20041223210426' ),
'log_namespace' => NS_MAIN,
'log_title' => 'DeleteAutoPatrolLogs',
+ 'log_comment_id' => $comment->id,
];
// Autopatrol #1
'log_timestamp' => $dbw->timestamp( '20051223210426' ),
'log_namespace' => NS_MAIN,
'log_title' => 'DeleteAutoPatrolLogs',
+ 'log_comment_id' => $comment->id,
];
// Block
'log_timestamp' => $dbw->timestamp( '20061223210426' ),
'log_namespace' => NS_MAIN,
'log_title' => 'DeleteAutoPatrolLogs',
+ 'log_comment_id' => $comment->id,
];
// Very old/ invalid patrol
'log_timestamp' => $dbw->timestamp( '20061223210426' ),
'log_namespace' => NS_MAIN,
'log_title' => 'DeleteAutoPatrolLogs',
+ 'log_comment_id' => $comment->id,
];
// Autopatrol #2
'log_timestamp' => $dbw->timestamp( '20071223210426' ),
'log_namespace' => NS_MAIN,
'log_title' => 'DeleteAutoPatrolLogs',
+ 'log_comment_id' => $comment->id,
];
// Autopatrol #3 old way
'log_timestamp' => $dbw->timestamp( '20081223210426' ),
'log_namespace' => NS_MAIN,
'log_title' => 'DeleteAutoPatrolLogs',
+ 'log_comment_id' => $comment->id,
];
// Manual patrol #2 old way
'log_timestamp' => $dbw->timestamp( '20091223210426' ),
'log_namespace' => NS_MAIN,
'log_title' => 'DeleteAutoPatrolLogs',
+ 'log_comment_id' => $comment->id,
];
// Autopatrol #4 very old way
'log_timestamp' => $dbw->timestamp( '20081223210426' ),
'log_namespace' => NS_MAIN,
'log_title' => 'DeleteAutoPatrolLogs',
+ 'log_comment_id' => $comment->id,
];
// Manual patrol #3 very old way
'log_timestamp' => $dbw->timestamp( '20091223210426' ),
'log_namespace' => NS_MAIN,
'log_title' => 'DeleteAutoPatrolLogs',
+ 'log_comment_id' => $comment->id,
];
$dbw->insert( 'logging', $logs );
dépôts / lhc / web / wiklou.git / commitdiff
