* Wikimedia\Rdbms\IDatabase::doAtomicSection(), non-native ::insertSelect(),
and non-MySQL ::replace() and ::upsert() no longer roll back the whole
transaction on failure.
+* (T189785) Added a monthly heartbeat ping to the pingback feature.
=== External library changes in 1.31 ===
* StripState::merge()
* The "free" CSS class is now only applied to unbracketed URLs in wikitext. Links
written using square brackets will get the class "text" not "free".
+* SpecialPageFactory::getList(), deprecated in 1.24, has been removed. You can
+ use ::getNames() instead.
* OpenSearch::getOpenSearchTemplate(), deprecated in 1.25, has been removed. You
can use ApiOpenSearch::getOpenSearchTemplate() instead.
* The global function wfBaseConvert, deprecated in 1.27, has been removed. Use
* The global function wfOutputHandler() was removed, use the its replacement
MediaWiki\OutputHandler::handle() instead. The global function was only sometimes defined.
Its replacement is always available via the autoloader.
+* ChangeTags::listExtensionActivatedTags and ::listExtensionDefinedTags, deprecated
+ in 1.28, have been removed. Use ::listSoftwareActivatedTags() and
+ ::listSoftwareDefinedTags() instead.
+* Title::getTitleInvalidRegex(), deprecated in 1.25, has been removed. You
+ can use MediaWikiTitleCodec::getTitleInvalidRegex() instead.
+* HTMLForm & VFormHTMLForm::isVForm(), deprecated in 1.25, have been removed.
+* The ProfileSection class, deprecated in 1.25 and unused, has been removed.
== Compatibility ==
MediaWiki 1.31 requires PHP 5.5.9 or later. Although HHVM 3.18.5 or later is supported,
The supported versions are:
* MySQL 5.0.3 or later
-* PostgreSQL 8.3 or later
+* PostgreSQL 9.2 or later
* SQLite 3.3.7 or later
* Oracle 9.0.1 or later
* Microsoft SQL Server 2005 (9.00.1399)
'Preprocessor_Hash' => __DIR__ . '/includes/parser/Preprocessor_Hash.php',
'ProcessCacheLRU' => __DIR__ . '/includes/libs/ProcessCacheLRU.php',
'Processor' => __DIR__ . '/includes/registration/Processor.php',
- 'ProfileSection' => __DIR__ . '/includes/profiler/ProfileSection.php',
'Profiler' => __DIR__ . '/includes/profiler/Profiler.php',
'ProfilerOutput' => __DIR__ . '/includes/profiler/output/ProfilerOutput.php',
'ProfilerOutputDb' => __DIR__ . '/includes/profiler/output/ProfilerOutputDb.php',
}
/**
- * Wrap status errors in an errorbox for increased visiblity
+ * Wrap status errors in an errorbox for increased visibility
*
* @param Status $status
* @return string Wikitext
}
/**
- * Has a pingback already been sent for this MediaWiki version?
+ * Has a pingback been sent in the last month for this MediaWiki version?
* @return bool
*/
private function checkIfSent() {
$dbr = wfGetDB( DB_REPLICA );
- $sent = $dbr->selectField(
- 'updatelog', '1', [ 'ul_key' => $this->key ], __METHOD__ );
- return $sent !== false;
+ $timestamp = $dbr->selectField(
+ 'updatelog',
+ 'ul_value',
+ [ 'ul_key' => $this->key ],
+ __METHOD__
+ );
+ if ( $timestamp === false ) {
+ return false;
+ }
+ // send heartbeat ping if last ping was over a month ago
+ if ( time() - (int)$timestamp > 60 * 60 * 24 * 30 ) {
+ return false;
+ }
+ return true;
}
/**
*/
private function markSent() {
$dbw = wfGetDB( DB_MASTER );
- return $dbw->insert(
- 'updatelog', [ 'ul_key' => $this->key ], __METHOD__, 'IGNORE' );
+ $timestamp = time();
+ return $dbw->upsert(
+ 'updatelog',
+ [ 'ul_key' => $this->key, 'ul_value' => $timestamp ],
+ [ 'ul_key' => $this->key ],
+ [ 'ul_value' => $timestamp ],
+ __METHOD__
+ );
}
/**
return $wgLegalTitleChars;
}
- /**
- * Returns a simple regex that will match on characters and sequences invalid in titles.
- * Note that this doesn't pick up many things that could be wrong with titles, but that
- * replacing this regex with something valid will make many titles valid.
- *
- * @deprecated since 1.25, use MediaWikiTitleCodec::getTitleInvalidRegex() instead
- *
- * @return string Regex string
- */
- static function getTitleInvalidRegex() {
- wfDeprecated( __METHOD__, '1.25' );
- return MediaWikiTitleCodec::getTitleInvalidRegex();
- }
-
/**
* Utility method for converting a character sequence from bytes to Unicode.
*
$res['id'] = $block->getId();
} else {
# should be unreachable
- $res['expiry'] = '';
- $res['id'] = '';
+ $res['expiry'] = ''; // @codeCoverageIgnore
+ $res['id'] = ''; // @codeCoverageIgnore
}
$res['reason'] = $params['reason'];
$hasHistory = false;
$reason = $page->getAutoDeleteReason( $hasHistory );
if ( $reason === false ) {
- return Status::newFatal( 'cannotdelete', $title->getPrefixedText() );
+ // Should be reachable only if the page has no revisions
+ return Status::newFatal( 'cannotdelete', $title->getPrefixedText() ); // @codeCoverageIgnore
}
}
);
}
- /**
- * @see listSoftwareActivatedTags
- * @deprecated since 1.28 call listSoftwareActivatedTags directly
- * @return array
- */
- public static function listExtensionActivatedTags() {
- wfDeprecated( __METHOD__, '1.28' );
- return self::listSoftwareActivatedTags();
- }
-
/**
* Basically lists defined tags which count even if they aren't applied to anything.
- * It returns a union of the results of listExplicitlyDefinedTags() and
- * listExtensionDefinedTags().
+ * It returns a union of the results of listExplicitlyDefinedTags()
*
* @return string[] Array of strings: tags
*/
);
}
- /**
- * Call listSoftwareDefinedTags directly
- *
- * @see listSoftwareDefinedTags
- * @deprecated since 1.28
- * @return array
- */
- public static function listExtensionDefinedTags() {
- wfDeprecated( __METHOD__, '1.28' );
- return self::listSoftwareDefinedTags();
- }
-
/**
* Invalidates the short-term cache of defined tags used by the
* list*DefinedTags functions, as well as the tag statistics cache.
return $this->displayFormat;
}
- /**
- * Test if displayFormat is 'vform'
- * @since 1.22
- * @deprecated since 1.25
- * @return bool
- */
- public function isVForm() {
- wfDeprecated( __METHOD__, '1.25' );
- return false;
- }
-
/**
* Get the HTMLFormField subclass for this descriptor.
*
*/
protected $displayFormat = 'vform';
- public function isVForm() {
- wfDeprecated( __METHOD__, '1.25' );
- return true;
- }
-
public static function loadInputFromParameters( $fieldname, $descriptor,
HTMLForm $parent = null
) {
'_InstallUser' => 'postgres',
];
- public static $minimumVersion = '8.3';
+ public static $minimumVersion = '9.2';
protected static $notMiniumumVerisonMessage = 'config-postgres-old';
public $maxRoleSearchDepth = 5;
[ 'log_timestamp', 'timestamptz_ops', 'btree', 0 ],
],
'CREATE INDEX "logging_times" ON "logging" USING "btree" ("log_timestamp")' ],
- [ 'dropIndex', 'oldimage', 'oi_name' ],
+ [ 'dropPgIndex', 'oldimage', 'oi_name' ],
[ 'checkIndex', 'oi_name_archive_name', [
[ 'oi_name', 'text_ops', 'btree', 0 ],
[ 'oi_archive_name', 'text_ops', 'btree', 0 ],
[ 'checkOiNameConstraint' ],
[ 'checkPageDeletedTrigger' ],
[ 'checkRevUserFkey' ],
- [ 'dropIndex', 'ipblocks', 'ipb_address' ],
+ [ 'dropPgIndex', 'ipblocks', 'ipb_address' ],
[ 'checkIndex', 'ipb_address_unique', [
[ 'ipb_address', 'text_ops', 'btree', 0 ],
[ 'ipb_user', 'int4_ops', 'btree', 0 ],
}
}
- protected function dropIndex( $table, $index, $patch = '', $fullpath = false ) {
+ protected function dropPgIndex( $table, $index ) {
if ( $this->db->indexExists( $table, $index ) ) {
$this->output( "Dropping obsolete index '$index'\n" );
$this->db->query( "DROP INDEX \"" . $index . "\"" );
"config-extensions": "Olekeni",
"config-skins": "Temey",
"config-install-step-done": "qeyd ke",
- "config-install-step-failed": "nêbı",
+ "config-install-step-failed": "ebe ser nêkewt",
"config-install-schema": "Şema dek",
"config-install-pg-commit": "Vırnayışa cemaati",
"config-install-tables": "Tabloy dek",
use HashBagOStuff;
use LogicException;
use InvalidArgumentException;
+use UnexpectedValueException;
use Exception;
use RuntimeException;
$this->flags |= self::DBO_TRX;
}
}
+ // Disregard deprecated DBO_IGNORE flag (T189999)
+ $this->flags &= ~self::DBO_IGNORE;
$this->sessionVars = $params['variables'];
public function setFlag( $flag, $remember = self::REMEMBER_NOTHING ) {
if ( ( $flag & self::DBO_IGNORE ) ) {
- throw new \UnexpectedValueException( "Modifying DBO_IGNORE is not allowed." );
+ throw new UnexpectedValueException( "Modifying DBO_IGNORE is not allowed." );
}
if ( $remember === self::REMEMBER_PRIOR ) {
public function clearFlag( $flag, $remember = self::REMEMBER_NOTHING ) {
if ( ( $flag & self::DBO_IGNORE ) ) {
- throw new \UnexpectedValueException( "Modifying DBO_IGNORE is not allowed." );
+ throw new UnexpectedValueException( "Modifying DBO_IGNORE is not allowed." );
}
if ( $remember === self::REMEMBER_PRIOR ) {
* @throws DBQueryError
*/
public function reportQueryError( $error, $errno, $sql, $fname, $tempIgnore = false ) {
- if ( $this->getFlag( self::DBO_IGNORE ) || $tempIgnore ) {
+ if ( $tempIgnore ) {
$this->queryLogger->debug( "SQL ERROR (ignored): $error\n" );
} else {
$sql1line = mb_substr( str_replace( "\n", "\\n", $sql ), 0, 5 * 1024 );
'section' => 'watchlist/advancedwatchlist',
'label-message' => 'tog-watchlisthideliu',
];
- $defaultPreferences['watchlistreloadautomatically'] = [
- 'type' => 'toggle',
- 'section' => 'watchlist/advancedwatchlist',
- 'label-message' => 'tog-watchlistreloadautomatically',
- ];
+
+ if ( !\SpecialWatchlist::checkStructuredFilterUiEnabled(
+ $this->config,
+ $user
+ ) ) {
+ $defaultPreferences['watchlistreloadautomatically'] = [
+ 'type' => 'toggle',
+ 'section' => 'watchlist/advancedwatchlist',
+ 'label-message' => 'tog-watchlistreloadautomatically',
+ ];
+ }
+
$defaultPreferences['watchlistunwatchlinks'] = [
'type' => 'toggle',
'section' => 'watchlist/advancedwatchlist',
+++ /dev/null
-<?php
-/**
- * Function scope profiling assistant
- *
- * 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 Profiler
- */
-
-/**
- * Class for handling function-scope profiling
- *
- * @since 1.22
- * @deprecated since 1.25 No-op now
- */
-class ProfileSection {
- /**
- * Begin profiling of a function and return an object that ends profiling
- * of the function when that object leaves scope. As long as the object is
- * not specifically linked to other objects, it will fall out of scope at
- * the same moment that the function to be profiled terminates.
- *
- * This is typically called like:
- * @code $section = new ProfileSection( __METHOD__ ); @endcode
- *
- * @param string $name Name of the function to profile
- */
- public function __construct( $name ) {
- wfDeprecated( __CLASS__, '1.25' );
- }
-}
$this->request = $request;
$this->logger = $resourceLoader->getLogger();
- // Future developers: Avoid use of getVal() in this class, which performs
- // expensive UTF normalisation by default. Use getRawVal() instead.
- // Values here are either one of a finite number of internal IDs,
- // or previously-stored user input (e.g. titles, user names) that were passed
- // to this endpoint by ResourceLoader itself from the canonical value.
- // Values do not come directly from user input and need not match.
+ // Future developers: Use WebRequest::getRawVal() instead getVal().
+ // The getVal() method performs slow Language+UTF logic. (f303bb9360)
// List of modules
$modules = $request->getRawVal( 'modules' );
*/
public function getModuleRegistrations( ResourceLoaderContext $context ) {
$resourceLoader = $context->getResourceLoader();
- $target = $context->getRequest()->getVal( 'target', 'desktop' );
+ // Future developers: Use WebRequest::getRawVal() instead getVal().
+ // The getVal() method performs slow Language+UTF logic. (f303bb9360)
+ $target = $context->getRequest()->getRawVal( 'target', 'desktop' );
// Bypass target filter if this request is Special:JavaScriptTest.
// To prevent misuse in production, this is only allowed if testing is enabled server-side.
$byPassTargetFilter = $this->getConfig()->get( 'EnableJavaScriptTest' ) && $target === 'test';
return array_keys( self::getPageList() );
}
- /**
- * Get the special page list as an array
- *
- * @deprecated since 1.24, use getNames() instead.
- * @return array
- */
- public static function getList() {
- wfDeprecated( __FUNCTION__, '1.24' );
- return self::getPageList();
- }
-
/**
* Get the special page list as an array
*
'ks-arab' => 'کٲشُر', # Kashmiri (Perso-Arabic script)
'ks-deva' => 'कॉशुर', # Kashmiri (Devanagari script)
'ksh' => 'Ripoarisch', # Ripuarian
- 'ku' => 'Kurdî', # Kurdish (multiple scripts - defaults to Latin)
- 'ku-latn' => "Kurdî (latînî)\xE2\x80\x8E", # Northern Kurdish (Latin script)
+ 'ku' => 'kurdî', # Kurdish (multiple scripts - defaults to Latin)
+ 'ku-latn' => "kurdî (latînî)\xE2\x80\x8E", # Northern Kurdish (Latin script)
'ku-arab' => "كوردي (عەرەبی)\xE2\x80\x8F", # Northern Kurdish (Arabic script) (falls back to ckb)
'kum' => 'къумукъ', # Kumyk (Cyrillic, 'kum-latn' for Latin script)
'kv' => 'коми', # Komi-Zyrian (Cyrillic is common script but also written in Latin script)
"right-patrolmarks": "Прагляд пазначэньняў пра патруляваньне ў апошніх зьменах",
"right-unwatchedpages": "Прагляд сьпісу старонак, за якімі ніхто не назірае",
"right-mergehistory": "Аб’яднаньне гісторыі старонак",
- "right-userrights": "рэдагаваньне правоў усіх удзельнікаў",
+ "right-userrights": "Рэдагаваньне ўсіх правоў удзельнікаў",
"right-userrights-interwiki": "рэдагаваньне правоў удзельнікаў у іншых вікі",
"right-siteadmin": "блякаваньне і разблякаваньне базы зьвестак",
"right-override-export-depth": "экспартаваньне старонак, уключаючы зьвязаныя старонкі з глыбінёй да 5",
"timezoneregion-indian": "Indijski okean",
"timezoneregion-pacific": "Tihi okean",
"allowemail": "Dozvoli e-poštu od ostalih korisnika",
+ "email-allow-new-users-label": "Dozvoli e-poštu od potpuno novih korisnika",
"email-blacklist-label": "Zabrani sljedećim korisnicima da mi šalju e-poštu:",
"prefs-searchoptions": "Pretraga",
"prefs-namespaces": "Imenski prostori",
"rcfilters-view-namespaces-tooltip": "Φιλτράρισμα αποτελεσμάτων κατά ονοματοχώρο",
"rcfilters-liveupdates-button": "Ζωντανή ανανέωση",
"rcfilters-liveupdates-button-title-on": "Απενεργοποίηση ζωντανής ανανέωσης",
+ "rcfilters-watchlist-markseen-button": "Σημειώστε όλες τις αλλαγές ως εξετασμένες",
+ "rcfilters-watchlist-edit-watchlist-button": "Διορθώστε τη λίστα παρακολούθησης",
+ "rcfilters-watchlist-showupdated": "Σελίδες που έχουν υποστεί αλλαγές από την τελευταία φορά που τις επισκεφθήκατε εμφανίζονται με '''έντονους χαρακτήρες'''.",
"rcfilters-preference-label": "Απόκρυψη της βελτιωμένης έκδοσης των Πρόσφατων Αλλαγών",
"rcfilters-preference-help": "Αναστέλλει τον επανασχεδιασμό διεπαφής 2017 και όλα τα εργαλεία που προστέθηκαν στη συνέχεια και από τότε.",
"rcnotefrom": "Παρακάτω {{PLURAL:$5|είναι η αλλαγή|είναι οι αλλαγές}} από <strong>$3, $4</strong> (έως <strong>$1</strong> που εμφανίζεται).",
"savechanges": "Save changes",
"publishpage": "Publish page",
"publishchanges": "Publish changes",
+ "savearticle-start": "Save page…",
+ "savechanges-start": "Save changes…",
+ "publishpage-start": "Publish page…",
+ "publishchanges-start": "Publish changes…",
"preview": "Preview",
"showpreview": "Show preview",
"showdiff": "Show changes",
"createacct-email-ph": "יש להקליד את כתובת הדוא\"ל שלך",
"createacct-another-email-ph": "יש להקליד כתובת דוא\"ל",
"createaccountmail": "שימוש בסיסמה זמנית אקראית ושליחתה לכתובת הדוא\"ל שצוינה",
- "createaccountmail-help": "×\99×\9b×\95×\9c ×\9cש×\9eש ×\9c×\99צ×\99רת ×\97ש×\91×\95×\9f ×¢×\91×\95ר ×\90×\93×\9d ×\90×\97ר ×\9e×\91×\9c×\99 ×\9c×\91רר ×\9e×\94×\99 הסיסמה.",
+ "createaccountmail-help": "×\99×\9b×\95×\9c ×\9cש×\9eש ×\9c×\99צ×\99רת ×\97ש×\91×\95×\9f ×¢×\91×\95ר ×\90×\93×\9d ×\90×\97ר ×\91×\9c×\99 ×\9c×\9c×\9e×\95×\93 ×\90ת הסיסמה.",
"createacct-realname": "שם אמיתי (לא חובה)",
"createacct-reason": "סיבה",
"createacct-reason-ph": "סיבה ליצירת חשבון נוסף",
"ipb_expiry_invalid": "זמן פקיעת החסימה אינו תקין.",
"ipb_expiry_old": "זמן התפוגה כבר עבר.",
"ipb_expiry_temp": "חסימות הכוללות הסתרת שם משתמש חייבות להיות לזמן בלתי מוגבל.",
- "ipb_hide_invalid": "לא ניתן להעלים את החשבון הזה; {{PLURAL:$1|בוצעה ממנו יותר מעריכה אחת|בוצעו ממנו יותר מ־$1 עריכות}}.",
+ "ipb_hide_invalid": "לא ניתן להעלים את החשבון הזה; {{PLURAL:$1|בוצעה ממנו יותר מעריכה אחת|בוצעו ממנו יותר מ־$1 עריכות}}.",
"ipb_already_blocked": "המשתמש \"$1\" כבר נחסם.",
"ipb-needreblock": "$1 כבר {{GENDER:$1|חסום|חסומה}}. האם ברצונך לשנות את הגדרות החסימה?",
"ipb-otherblocks-header": "{{PLURAL:$1|חסימה אחרת|חסימות אחרות}}",
"wrongpasswordempty": "Nem adtál meg jelszót. Próbáld meg újra.",
"passwordtooshort": "A jelszónak legalább $1 karakterből kell állnia.",
"passwordtoolong": "A jelszó nem lehet hosszabb $1 karakternél.",
- "passwordtoopopular": "A gyakori jelszavak nem használhatók. Válassz egy egyedibb jelszót.",
+ "passwordtoopopular": "A gyakran használt jelszavak nem használhatók. Válassz olyan jelszót, amit nehezebb kitalálni.",
"password-name-match": "A jelszavadnak különböznie kell a szerkesztőnevedtől.",
"password-login-forbidden": "Ezen felhasználónév és jelszó használata tiltott.",
"mailmypassword": "Jelszó alaphelyzetbe állítása",
"permissionserrorstext": "Ձեզ չի թույլատրվում դա անել հետևյալ {{PLURAL:$1|պատճառով|պատճառներով}}.",
"permissionserrorstext-withaction": "Ձեզ չի թույլատրվում $2 հետևյալ {{PLURAL:$1|պատճառով|պատճառներով}}.",
"recreate-moveddeleted-warn": "'''Զգուշացում. դուք փորձում եք վերստեղծել մի էջ, որը ջնջվել է նախկինում։'''\n\nԽնդրում ենք վերանայել ձեր խմբագրման նպատակահարմարությունը։ Հարմարության համար ստորև բերված են այս էջի ջնջման և տեղափոխման տեղեկամատյանները։",
- "moveddeleted-notice": "Այս էջը հեռացված է։\nԷջի մասին գրառումները տեղափոխման և ջնջման տեղեկամատյանից բերված են ստորև տեղեկության համար։",
+ "moveddeleted-notice": "Այս էջը հեռացված է։\nԷջի մասին գրառումները տեղափոխման, պաշտպանման և ջնջման տեղեկամատյանից բերված են ստորև տեղեկության համար։",
"log-fulllog": "Դիտել ամբողջական տեղեկամատյանը",
"edit-conflict": "Խմբագրման ընհարում։",
"edit-no-change": "Ձեր խմբագրումը անտեսվել է, քանի որ ոչ մի փոփոխություն չի կատարվել տեքստի մեջ։",
"alllogstext": "Kombinata montro di omna 'log'-i di {{SITENAME}} disponebla.\nVu povas stretigar la vidado per la selekto di la tipo di protoloko (log type), l'uzantonomo (case-sensitive), o la pagino afektita (also case-sensitive).",
"logempty": "Nula kombinuri trovesis en la protokolo.",
"showhideselectedlogentries": "Modifikar la videbleso di la selektita eniri di 'log'",
+ "checkbox-select": "Selektez: $1",
+ "checkbox-all": "Omna",
+ "checkbox-none": "Nula",
+ "checkbox-invert": "Inversigar",
"allpages": "Omna pagini",
"nextpage": "Sequanta pagino ($1)",
"prevpage": "Antea pagino ($1)",
"delete-confirm": "Efacar \"$1\"",
"delete-legend": "Efacar",
"historywarning": "<strong>Averto:</strong> La pagino quan vu efaceskas havas historio kun $1 {{PLURAL:$1|revizo|revizi}}:",
+ "historyaction-submit": "Montrez",
"confirmdeletetext": "Vu selektis efacar ica pagino komplete, inkluzite omna modifiki en ol e la kronologio di la modifiki.\n\nVoluntez konfirmar ke vu fakte deziras facar to, ke vu komprenas omna konsequi dil efaco, e ke vu efacos ol segun [[{{MediaWiki:Policy-url}}|la normi pri l'efaco di artikli]].",
"actioncomplete": "Ago kompletigita",
"deletedtext": "\"$1\" efacesis.\nVidez $2 por obtenar registro di recenta efaci.",
"rollback": "Retrorulez redakti",
"rollbacklink": "retrorulez",
"rollbacklinkcount": "nuligar $1 {{PLURAL:$1|modifiko|modifiki}}",
+ "rollbacklinkcount-morethan": "nuligar nemediate plua kam $1 {{PLURAL:$1|redakto|redakti}}",
"rollbackfailed": "Retrorular ne sucesis",
"cantrollback": "Ne esas posibla retrorular. La lasta kontributanto esas la nura autoro di ica pagino.",
"alreadyrolled": "Vu ne povas retrorular la lasta chanjo di [[:$1]] da [[User:$2|$2]] ([[User talk:$2|Diskutez]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);\nulu pluse ja redaktis o retrorulis ica pagino.\n\nLa lasta chanjo a la pagino esis da [[User:$3|$3]] ([[User talk:$3|Diskutez]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).",
"uctop": "(aktuala)",
"month": "De monato (e plu frue):",
"year": "De yaro (e plu frue):",
- "sp-contributions-newbies": "Montrez nur kontributadi di nova konti",
+ "sp-contributions-newbies": "Montrez nur kontributadi di la nova uzeri",
"sp-contributions-newbies-sub": "Di nova konti",
"sp-contributions-blocklog": "blokusar-registraro",
"sp-contributions-deleted": "efacita {{GENDER:$1|uzero}}-kontributadi",
"pageinfo-toolboxlink": "Informo di ca pagino",
"pageinfo-contentpage": "Konsiderita kontenajo-pagino",
"pageinfo-contentpage-yes": "Yes",
+ "markaspatrolledtext": "Patroliar ica pagino",
"patrol-log-page": "Protokolo pri patroliado",
"previousdiff": "← Plu anciena versiono",
"nextdiff": "Plu recenta versiono →",
"table_pager_prev": "Antea pagino",
"table_pager_first": "Unesma pagino",
"table_pager_last": "Lasta pagino",
+ "table_pager_limit": "Montrez $1 artiklo per pagino",
"table_pager_limit_submit": "Irar",
"table_pager_empty": "Nula rezultajo",
"autosumm-blank": "Pagino vakuigesis",
"wrongpasswordempty": "パスワードを空欄にはできません。\nもう一度やり直してください。",
"passwordtooshort": "パスワードは {{PLURAL:$1|$1 文字}}以上にしてください。",
"passwordtoolong": "パスワードは {{PLURAL:$1|$1 文字}}以下にしてください。",
- "passwordtoopopular": "選択したパスワードはありきたりであるため使用することはできません。誰も思いつかないようなパスワードを選択してください。",
+ "passwordtoopopular": "選択したパスワードはありきたりであるため使用することはできません。簡単に思いつかないようなパスワードを選択してください。",
"password-name-match": "パスワードは利用者名とは異なる必要があります。",
"password-login-forbidden": "この利用者名とパスワードの使用は禁止されています。",
"mailmypassword": "パスワードを再設定",
"Nuevo Paso"
]
},
- "tog-underline": "링크에 밑줄:",
+ "tog-underline": "링크에 밑줄 긋기:",
"tog-hideminor": "최근 바뀜에서 사소한 편집을 숨기기",
"tog-hidepatrolled": "최근 바뀜에서 점검한 편집을 숨기기",
"tog-newpageshidepatrolled": "새 문서 목록에서 검토한 문서를 숨기기",
"tog-enotifminoredits": "문서나 파일의 사소한 편집도 이메일로 알림",
"tog-enotifrevealaddr": "알림 메일에 내 이메일 주소를 밝히기",
"tog-shownumberswatching": "주시하는 사용자 수 보이기",
- "tog-oldsig": "당신의 기존 서명:",
+ "tog-oldsig": "기존 서명:",
"tog-fancysig": "서명을 위키텍스트로 취급 (자동으로 링크를 걸지 않음)",
"tog-uselivepreview": "페이지를 다시 불러오지 않고 미리 보기 표시",
"tog-forceeditsummary": "편집 요약을 쓰지 않았을 때 내게 물어보기",
"tog-useeditwarning": "바꾼 내용을 저장하지 않고 편집 페이지를 벗어날 때 내게 알리기",
"tog-prefershttps": "로그인하는 동안 항상 보안 연결 사용",
"underline-always": "항상",
- "underline-never": "항상 치지 않기",
+ "underline-never": "항상 긋지 않기",
"underline-default": "스킨 또는 브라우저 기본값",
"editfont-style": "편집 영역의 글꼴 형식:",
"editfont-monospace": "고정폭 글꼴",
"prefs-watchlist": "주시문서 목록",
"prefs-editwatchlist": "주시문서 목록 편집",
"prefs-editwatchlist-label": "주시문서 목록의 항목을 편집합니다:",
- "prefs-editwatchlist-edit": "주시문서의 제목을 보고 지우기",
+ "prefs-editwatchlist-edit": "주시문서 목록의 제목 보기 및 지우기",
"prefs-editwatchlist-raw": "주시문서 목록 직접 편집하기",
- "prefs-editwatchlist-clear": "주시문서 목록 지우기",
+ "prefs-editwatchlist-clear": "주시문서 목록 비우기",
"prefs-watchlist-days": "주시문서 목록에서 볼 날짜 수:",
"prefs-watchlist-days-max": "최대 $1{{PLURAL:$1|일}}",
"prefs-watchlist-edits": "주시문서 목록에서 볼 최대 변경사항의 수:",
"prefs-email": "이메일 옵션",
"prefs-rendering": "보이기",
"saveprefs": "저장",
- "restoreprefs": "(모든 부분에서) 모두 기본 설정으로 되돌리기",
+ "restoreprefs": "모두 기본 설정으로 되돌리기(모든 부문)",
"prefs-editing": "편집",
"searchresultshead": "검색",
- "stub-threshold": "링크를 토막글 형식으로 보여줄 문서 크기 ($1):",
- "stub-threshold-sample-link": "ì\83\98í\94\8c",
+ "stub-threshold": "토막글 링크의 형식으로 보여줄 최소 수치($1):",
+ "stub-threshold-sample-link": "ì\98\88ì\8b\9c",
"stub-threshold-disabled": "비활성화됨",
"recentchangesdays": "최근 바뀜에 보여줄 날짜 수:",
"recentchangesdays-max": "최대 $1{{PLURAL:$1|일}}",
"timezoneregion-pacific": "태평양",
"allowemail": "다른 사용자가 내게 이메일을 보낼 수 있게 허용",
"email-allow-new-users-label": "처음 온 사용자들로부터 오는 이메일 허용",
- "email-blacklist-label": "이 사용자들이 내게 이메일을 보내는 것을 금지합니다:",
+ "email-blacklist-label": "이 사용자가 내게 이메일을 보내지 못하게 합니다:",
"prefs-searchoptions": "검색",
"prefs-namespaces": "이름공간",
"default": "기본값",
"prefs-help-signature": "토론 문서에 글을 쓴 후에는 마지막에 서명을 해야 합니다. “<nowiki>~~~~</nowiki>” 기호를 추가하면 서명과 글 작성 시각이 자동으로 입력됩니다.",
"badsig": "서명이 잘못되었습니다.\nHTML 태그를 확인하세요.",
"badsiglength": "서명이 너무 깁니다.\n서명은 $1 {{PLURAL:$1|글자}}보다 짧아야 합니다.",
- "yourgender": "ì\96´ë\96¤ ì\84±ë³\84ë¡\9c í\91\9cì\8b\9cë\90\98ë\8a\94 ê²\83ì\9d\84 ì\84 í\98¸í\95©니까?",
- "gender-unknown": "당신을 언급할 때, 소프트웨어는 가능한 한 성 중립적인 단어를 사용할 것입니다.",
- "gender-male": "위키 문서를 편집하는 남자입니다",
- "gender-female": "ì\9c\84í\82¤ 문ì\84\9c를 í\8e¸ì§\91í\95\98ë\8a\94 ì\97¬ì\9e\90ì\9e\85ë\8b\88ë\8b¤",
+ "yourgender": "ì\96´ë\8a\90 ì\84±ë³\84ë¡\9c ë¬\98ì\82¬í\95\98기를 ì\9b\90í\95\98ì\8b니까?",
+ "gender-unknown": "언급할 때 소프트웨어는 가능한 항상 중성적인 단어를 사용합니다.",
+ "gender-male": "남성이 위키 문서를 편집합니다.",
+ "gender-female": "ì\97¬ì\84±ì\9d´ ì\9c\84í\82¤ 문ì\84\9c를 í\8e¸ì§\91í\95©ë\8b\88ë\8b¤.",
"prefs-help-gender": "이 환경 설정은 선택 사항입니다.\n소프트웨어는 적절한 성별 문법을 사용하여 다른 사용자에게 당신을 언급하는 것을 해결하기 위해 사용됩니다.\n이 정보는 공개됩니다.",
"email": "이메일",
"prefs-help-realname": "실명은 선택 사항입니다.\n실명을 입력하면 당신의 기여에 대한 저작자 표시에 쓰이게 될 수 있습니다.",
"anoneditwarning": "<strong>Hişyarî:</strong> Tu netêketî yî! Navnîşana IP'ya te wê di dîroka guherandina vê rûpelê de bê tomarkirin. Heke tu <strong>[$1 têkevî]</strong> an jî <strong>[$2 hesabekî çêbikî]</strong>, li gel sûdên te yên din guhertinên ku tu bikî jî wê ji nasnavê te re bê atfkirin.",
"anonpreviewwarning": "''Tu ne têketî yî. Tomarkirin wê navnîşana IP'ya te di dîroka guhertinan de nîşan bide.''",
"missingsummary": "<span style=\"color:#990000;\">'''Zanibe:'''</span> Te nivîsekî kurt ji bo guherandinê ra nenivîsand. Eger tu niha carekî din li Tomar xê, guherandinê te vê nivîsekî kurt yê were tomarkirin.",
- "missingcommenttext": "Ji kerema xwe kurteya naverokê li jêr binivisîne.",
+ "missingcommenttext": "Ji kerema xwe kurteya naverokê binivîsîne.",
"missingcommentheader": "<strong>Zanibe:</strong> Te sernav/mijarek nenivîsandîye. Heke tu niha carekî din li ser \"$1\" bitikînî, ev guherandina te bê sernav/mijar wê were tomarkirin.",
"summary-preview": "Pêşdîtina kurtenivîsa guherandinê:",
"subject-preview": "Pêşdîtina mijarê:",
"history-feed-empty": "Rûpela xwestî tune ye. Belkî ew rûpel jê hatibe birîn an jî sernavê wê hatibe guherandin. [[Special:Search|Di wîkîyê de li rûpelên nêzîkî wê bigere]].",
"rev-deleted-comment": "(kurteya guherandinê hate jêbirin)",
"rev-deleted-user": "(navê bikarhêner hate jêbirin)",
- "rev-deleted-event": "(pêkhatin hate jêbirin)",
- "rev-deleted-text-permission": "Ev guhertoya vê rûpelê hatiye jêbirin. Belkî agahî di [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} jêbirina têketinê] de hebe.",
+ "rev-deleted-event": "(dêtayên qeydê hate jêbirin)",
+ "rev-deleted-text-permission": "Guhertoya vê rûpelê <strong>hatiye jêbirin</strong>. Dêtayên vê di [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} qeyda jêbirinê] de dikarî bibînî.",
"rev-delundel": "xuyakirinê biguherîne",
"rev-showdeleted": "nîşan bide",
"revisiondelete": "Guhertoyan jê bibe/nebe",
"search-category": "(kategorî $1)",
"search-file-match": "(bi naveroka dosye re lê te)",
"search-suggest": "Gelo mebesta te ev bû: $1",
- "search-interwiki-caption": "Projeyên hevçeng",
+ "search-interwiki-caption": "Netîceyên ji projeyên hevçeng",
"search-interwiki-default": "Encamên ji $1:",
"search-interwiki-more": "(bêhtir)",
"search-relatedarticle": "Pêwendîdar",
"prefs-editwatchlist-clear": "Lîsteya xwe ya şopandinê paqij bike",
"prefs-watchlist-days": "Hejmara rojên ku di lîsteya şopandinê de bê nîşandan:",
"prefs-watchlist-days-max": "Herî zêde $1 {{PLURAL:$1|roj|rojan}}",
- "prefs-watchlist-edits": "Hejmara maximum guhertinê ê di lîsteya şopandinê ya berfirehkirî de bê nîşandanː",
+ "prefs-watchlist-edits": "Hejmara maximum yê guhertinan wê di lîsteya şopandinê de bê nîşandanː",
"prefs-watchlist-edits-max": "Hejmara mezintirîn: 1000",
"prefs-misc": "Eyarên cuda",
"prefs-resetpass": "Şifreyê biguherîne",
- "prefs-changeemail": "Navnîşana e-nameyê biguherîne",
+ "prefs-changeemail": "Navnîşana e-nameyê biguherîne an jî rake",
"prefs-setemail": "Navnîşana e-nameyê binivîse",
"prefs-email": "Vebijarkên Enameyê",
"prefs-rendering": "Rû",
"prefs-registration": "Dema xweqeydkirinê:",
"yourrealname": "Navê te yê rast:",
"yourlanguage": "Ziman:",
- "yourvariant": "Cuda:",
+ "yourvariant": "Varyanta zimanê naverokê:",
"yournick": "Bernavkê nû (ji bo îmzeyê):",
"badsig": "Îmzeya ne derbasdar! Li HTML binêre ka sedema şaşbûnê çiye.",
"badsiglength": "Navê te zêde dirêj e; pêwîst e di bin {{PLURAL:$1|nîşanekê|nîşanan}} de be.",
"prefs-displaywatchlist": "Vebijarkan nîşan bide",
"prefs-diffs": "Cudahî",
"userrights": "Îdarekirina mafên bikarhêneran",
- "userrights-lookup-user": "Birêvebirina koman",
+ "userrights-lookup-user": "Bikarhênerek bibijêre",
"userrights-user-editname": "Navekî bikarhêneriyê binivîse:",
- "editusergroup": "Komên bikarhêneran biguherîne",
+ "editusergroup": "Komên bikarhêneran nîşan bide",
"editinguser": "Mafên bikarhêner '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) tên guhertin",
"userrights-editusergroup": "Komên bikarhêneran biguherîne",
"saveusergroups": "Komên {{GENDER:$1|bikarhêneran}} tomar bike",
"action-movefile": "vê daneyê bigerîne",
"action-upload": "vê daneyê bar bike",
"action-delete": "vê rûpelê jê bibe",
- "action-deleterevision": "Vê revîzyonê je bibe",
+ "action-deleterevision": "revîzyonan jê bibe",
"action-deletedhistory": "dîroka vê rûpelê jêbirî bibîne",
"action-browsearchive": "li rûpelên jêbirî bigere",
"action-undelete": "vê rûpelê jê nebe",
"notanarticle": "Ne gotar e",
"watchlist-details": "{{PLURAL:$1|Rûpelekî|$1 rûpel}} li ser lîsteya te ya şopandinê ye (xeynî rûpelên gotûbêjê).",
"wlheader-enotif": "Agahdariya e-nameyan hate çalakkirin",
- "wlheader-showupdated": "Ev rûpela hatî guhertin dema te lê meyzand bi <strong>nivîsa stûr<strong> tê xuyakirin.",
- "wlnote": "Ji $3, $4 heta niha {{PLURAL:$1|guherandinê|</strong>$1</strong> guherandinên}} dawî yê {{PLURAL:$2|saetê|</strong>$2</strong> saetên}} dawî {{PLURAL:$1|tê|tên}} dîtin.",
+ "wlheader-showupdated": "Ev rûpela hatî guhertin dema te lê meyzand bi <strong>nivîsa stûr</strong> tê xuyakirin.",
+ "wlnote": "Ji $3, $4 heta niha {{PLURAL:$1|guherandinê|<strong>$1</strong> guherandinên}} dawî yê {{PLURAL:$2|saetê|<strong>$2</strong> saetên}} dawî {{PLURAL:$1|tê|tên}} dîtin.",
"wlshowlast": "Guhertinên berî $1 saetan, $2 rojan nîşan bide",
"watchlist-hide": "Veşêre",
"watchlist-submit": "Nîşan bide",
"savechanges": "Text on the button to save the changes to an existing page. It should be an action which is short and makes clear that the effect is immediate and public.\n\nSee also {{msg-mw|showpreview}} and {{msg-mw|showdiff}} for the other buttons, and {{msg-mw|savearticle}} for the label for the button when the page is being modified.\n\nNote: This i18n is being introduced in advance of usage to provide extra time for translators.\n\nSee also:\n* {{msg-mw|Accesskey-publish}}\n* {{msg-mw|Tooltip-publish}}\n{{Identical|Save changes}}",
"publishpage": "Text on the button to create a new page on a public wiki. It should be an action which is short and makes clear that the effect is immediate and public.\n\nSee also {{msg-mw|showpreview}} and {{msg-mw|showdiff}} for the other buttons, and {{msg-mw|publishchanges}} for the label for the button when the page is being modified.\n\nNote: This i18n is being introduced in advance of usage to provide extra time for translators.\n\nSee also:\n* {{msg-mw|Accesskey-publish}}\n* {{msg-mw|Tooltip-publish}}\n{{Identical|Publish page}}",
"publishchanges": "Text on the button to save the changes to an existing page on a public wiki. It should be an action which is short and makes clear that the effect is immediate and public.\n\nSee also {{msg-mw|showpreview}} and {{msg-mw|showdiff}} for the other buttons, and {{msg-mw|publishchanges}} for the label for the button when the page is being created.\n\nNote: This i18n is being introduced in advance of usage to provide extra time for translators.\n\nSee also:\n* {{msg-mw|Accesskey-publish}}\n* {{msg-mw|Tooltip-publish}}\n{{Identical|Publish changes}}",
+ "savearticle-start": "Text on the button to start the process to create a new page. Usually just {{msg-mw|savearticle}} with an ellipsis (…).",
+ "savechanges-start": "Text on the button to start the process save the changes to an existing page. Usually just {{msg-mw|savechanges}} with an ellipsis (…).",
+ "publishpage-start": "Text on the button to start the process create a new page on a public wiki. Usually just {{msg-mw|publishpage}} with an ellipsis (…).",
+ "publishchanges-start": "Text on the button to start the process save the changes to an existing page on a public wiki. Usually just {{msg-mw|publishchanges}} with an ellipsis (…).",
"preview": "The title of the Preview page shown after clicking the \"Show preview\" button in the edit page. Since this is a heading, it should probably be translated as a noun and not as a verb.\n\n{{Identical|Preview}}",
"showpreview": "The text of the button to preview the page you are editing. See also {{msg-mw|showdiff}} and {{msg-mw|savearticle}} for the other buttons.\n\nSee also:\n* {{msg-mw|Showpreview}}\n* {{msg-mw|Accesskey-preview}}\n* {{msg-mw|Tooltip-preview}}\n{{Identical|Show preview}}",
"showdiff": "Button below the edit page. See also {{msg-mw|Showpreview}} and {{msg-mw|Savearticle}} for the other buttons.\n\nSee also:\n* {{msg-mw|Showdiff}}\n* {{msg-mw|Accesskey-diff}}\n* {{msg-mw|Tooltip-diff}}\n{{Identical|Show change}}",
"recentchanges-label-unpatrolled": "Непатролирана измена",
"recentchanges-label-plusminus": "Промена величине странице у бајтовима",
"recentchanges-legend-heading": "<strong>Легенда:</strong>",
- "recentchanges-legend-newpage": "[[w:sr:Посебно:НовеСтране|<u>Н</u>ова страница]]",
+ "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} ([[Special:NewPages|списак нових страница]])",
"recentchanges-submit": "Прикажи",
"rcfilters-tag-remove": "Уклоните филтер „$1”",
"rcfilters-legend-heading": "<strong>Списак скраћеница:</strong>",
"tooltip-pt-userpage": "{{GENDER:|Ваша}} корисничка страница",
"tooltip-pt-anonuserpage": "Корисничка страница за ИП адресу с које уређујете",
"tooltip-pt-mytalk": "{{GENDER:|Ваша}} страница за разговор",
- "tooltip-pt-anontalk": "Разговор о изменама с ове ИП адресе",
+ "tooltip-pt-anontalk": "Разговор о изменама са ове IP адресе",
"tooltip-pt-preferences": "{{GENDER:|Ваша}} подешавања",
"tooltip-pt-watchlist": "Списак страница које надгледате",
"tooltip-pt-mycontris": "Списак {{GENDER:|Ваших}} доприноса",
"tooltip-pt-anoncontribs": "Списак измена направљених са ове IP адресе",
- "tooltip-pt-login": "Ð\9fÑ\80епоÑ\80Ñ\83Ñ\87Ñ\83Ñ\98емо вам да Ñ\81е пÑ\80иÑ\98авиÑ\82е, иако Ñ\82о ниÑ\98е обавезно.",
+ "tooltip-pt-login": "Ð\9fÑ\80епоÑ\80Ñ\83Ñ\87Ñ\83Ñ\98емо Ð\92ам да Ñ\81е пÑ\80иÑ\98авиÑ\82е, иако Ñ\82о ниÑ\98е обавезно",
"tooltip-pt-login-private": "Морате да се пријавите да бисте користили овај Вики",
"tooltip-pt-logout": "Одјавите се",
- "tooltip-pt-createaccount": "Ð\9eÑ\85Ñ\80абÑ\80Ñ\83Ñ\98емо ваÑ\81 да оÑ\82воÑ\80иÑ\82е налог и пÑ\80иÑ\98авиÑ\82е Ñ\81е али то није обавезно",
+ "tooltip-pt-createaccount": "Ð\9fÑ\80епоÑ\80Ñ\83Ñ\87иÑ\98емо Ð\92ам да оÑ\82воÑ\80иÑ\82е налог и пÑ\80иÑ\98авиÑ\82е Ñ\81е, иако то није обавезно",
"tooltip-ca-talk": "Разговор о страници са садржајем",
"tooltip-ca-edit": "Уредите ову страницу",
"tooltip-ca-addsection": "Започните нови одељак",
"tooltip-ca-move": "Премести ову страницу",
"tooltip-ca-watch": "Додајте ову страницу на списак надгледања",
"tooltip-ca-unwatch": "Уклони ову страницу са списка надгледања",
- "tooltip-search": "Ð\9fÑ\80еÑ\82Ñ\80ажи пÑ\80оÑ\98екаÑ\82 {{SITENAME}}",
+ "tooltip-search": "Ð\9fÑ\80еÑ\82Ñ\80ага",
"tooltip-search-go": "Идите на страницу с овим именом, ако постоји",
"tooltip-search-fulltext": "Претражите странице с овим текстом",
"tooltip-p-logo": "Посетите главну страну",
"rcfilters-view-tags-tooltip": "Фільтрувати результати, використовуючи мітки до редагувань",
"rcfilters-view-return-to-default-tooltip": "Повернутися до головного меню фільтра",
"rcfilters-view-tags-help-icon-tooltip": "Дізнайтесь більше про редагування з мітками",
- "rcfilters-liveupdates-button": "Ð\9eновленнÑ\8f наживо",
- "rcfilters-liveupdates-button-title-on": "Ð\92имкнÑ\83Ñ\82и оновленнÑ\8f наживо",
+ "rcfilters-liveupdates-button": "Ð\90вÑ\82омаÑ\82иÑ\87не оновленнÑ\8f",
+ "rcfilters-liveupdates-button-title-on": "Ð\92имкнÑ\83Ñ\82и авÑ\82омаÑ\82иÑ\87не оновленнÑ\8f",
"rcfilters-liveupdates-button-title-off": "Показувати нові зміни одразу ж після їх здійснення",
"rcfilters-watchlist-markseen-button": "Позначити всі зміни як переглянуті",
"rcfilters-watchlist-edit-watchlist-button": "Редагувати Ваш список спостереження",
// Set content language. This invalidates the magic word cache and title services
$lang = Language::factory( $langCode );
+ $lang->resetNamespaces();
$setup['wgContLang'] = $lang;
$reset = function () {
MagicWord::clearCache();
* @covers ApiBlock
*/
class ApiBlockTest extends ApiTestCase {
+ protected $mUser = null;
+
protected function setUp() {
parent::setUp();
$this->doLogin();
+
+ $this->mUser = $this->getMutableTestUser()->getUser();
}
protected function tearDown() {
- $block = Block::newFromTarget( 'UTApiBlockee' );
+ $block = Block::newFromTarget( $this->mUser->getName() );
if ( !is_null( $block ) ) {
$block->delete();
}
return $this->getTokenList( self::$users['sysop'] );
}
- function addDBDataOnce() {
- $user = User::newFromName( 'UTApiBlockee' );
-
- if ( $user->getId() == 0 ) {
- $user->addToDatabase();
- TestUser::setPasswordForUser( $user, 'UTApiBlockeePassword' );
-
- $user->saveSettings();
- }
- }
-
/**
- * This test has probably always been broken and use an invalid token
- * Bug tracking brokenness is https://phabricator.wikimedia.org/T37646
- *
- * Root cause is https://gerrit.wikimedia.org/r/3434
- * Which made the Block/Unblock API to actually verify the token
- * previously always considered valid (T36212).
+ * @param array $extraParams Extra API parameters to pass to doApiRequest
+ * @param User $blocker User to do the blocking, null to pick
+ * arbitrarily
*/
- public function testMakeNormalBlock() {
- $tokens = $this->getTokens();
+ private function doBlock( array $extraParams = [], User $blocker = null ) {
+ if ( $blocker === null ) {
+ $blocker = self::$users['sysop']->getUser();
+ }
- $user = User::newFromName( 'UTApiBlockee' );
+ $tokens = $this->getTokens();
- if ( !$user->getId() ) {
- $this->markTestIncomplete( "The user UTApiBlockee does not exist" );
- }
+ $this->assertNotNull( $this->mUser, 'Sanity check' );
+ $this->assertNotSame( 0, $this->mUser->getId(), 'Sanity check' );
- if ( !array_key_exists( 'blocktoken', $tokens ) ) {
- $this->markTestIncomplete( "No block token found" );
- }
+ $this->assertArrayHasKey( 'blocktoken', $tokens, 'Sanity check' );
- $this->doApiRequest( [
+ $params = [
'action' => 'block',
- 'user' => 'UTApiBlockee',
+ 'user' => $this->mUser->getName(),
'reason' => 'Some reason',
- 'token' => $tokens['blocktoken'] ], null, false, self::$users['sysop']->getUser() );
+ 'token' => $tokens['blocktoken'],
+ ];
+ if ( array_key_exists( 'userid', $extraParams ) ) {
+ // Make sure we don't have both user and userid
+ unset( $params['user'] );
+ }
+ $ret = $this->doApiRequest( array_merge( $params, $extraParams ), null,
+ false, $blocker );
- $block = Block::newFromTarget( 'UTApiBlockee' );
+ $block = Block::newFromTarget( $this->mUser->getName() );
$this->assertTrue( !is_null( $block ), 'Block is valid' );
- $this->assertEquals( 'UTApiBlockee', (string)$block->getTarget() );
- $this->assertEquals( 'Some reason', $block->mReason );
- $this->assertEquals( 'infinity', $block->mExpiry );
+ $this->assertSame( $this->mUser->getName(), (string)$block->getTarget() );
+ $this->assertSame( 'Some reason', $block->mReason );
+
+ return $ret;
+ }
+
+ /**
+ * Block by username
+ */
+ public function testNormalBlock() {
+ $this->doBlock();
}
/**
* Block by user ID
*/
- public function testMakeNormalBlockId() {
- $tokens = $this->getTokens();
- $user = User::newFromName( 'UTApiBlockee' );
+ public function testBlockById() {
+ $this->doBlock( [ 'userid' => $this->mUser->getId() ] );
+ }
- if ( !$user->getId() ) {
- $this->markTestIncomplete( "The user UTApiBlockee does not exist." );
- }
+ /**
+ * A blocked user can't block
+ */
+ public function testBlockByBlockedUser() {
+ $this->setExpectedException( ApiUsageException::class,
+ 'You cannot block or unblock other users because you are yourself blocked.' );
+
+ $blocked = $this->getMutableTestUser( [ 'sysop' ] )->getUser();
+ $block = new Block( [
+ 'address' => $blocked->getName(),
+ 'by' => self::$users['sysop']->getUser()->getId(),
+ 'reason' => 'Capriciousness',
+ 'timestamp' => '19370101000000',
+ 'expiry' => 'infinity',
+ ] );
+ $block->insert();
+
+ $this->doBlock( [], $blocked );
+ }
- if ( !array_key_exists( 'blocktoken', $tokens ) ) {
- $this->markTestIncomplete( "No block token found" );
- }
+ public function testBlockOfNonexistentUser() {
+ $this->setExpectedException( ApiUsageException::class,
+ 'There is no user by the name "Nonexistent". Check your spelling.' );
- $data = $this->doApiRequest( [
- 'action' => 'block',
- 'userid' => $user->getId(),
- 'reason' => 'Some reason',
- 'token' => $tokens['blocktoken'] ], null, false, self::$users['sysop']->getUser() );
+ $this->doBlock( [ 'user' => 'Nonexistent' ] );
+ }
+
+ public function testBlockOfNonexistentUserId() {
+ $id = 948206325;
+ $this->setExpectedException( ApiUsageException::class,
+ "There is no user with ID $id." );
+
+ $this->assertFalse( User::whoIs( $id ), 'Sanity check' );
+
+ $this->doBlock( [ 'userid' => $id ] );
+ }
+
+ public function testBlockWithTag() {
+ ChangeTags::defineTag( 'custom tag' );
+
+ $this->doBlock( [ 'tags' => 'custom tag' ] );
+
+ $dbw = wfGetDB( DB_MASTER );
+ $this->assertSame( 'custom tag', $dbw->selectField(
+ [ 'change_tag', 'logging' ],
+ 'ct_tag',
+ [ 'log_type' => 'block' ],
+ __METHOD__,
+ [],
+ [ 'change_tag' => [ 'INNER JOIN', 'ct_log_id = log_id' ] ]
+ ) );
+ }
+
+ public function testBlockWithProhibitedTag() {
+ $this->setExpectedException( ApiUsageException::class,
+ 'You do not have permission to apply change tags along with your changes.' );
+
+ ChangeTags::defineTag( 'custom tag' );
+
+ $this->setMwGlobals( 'wgRevokePermissions',
+ [ 'user' => [ 'applychangetags' => true ] ] );
+
+ $this->doBlock( [ 'tags' => 'custom tag' ] );
+ }
+
+ public function testBlockWithHide() {
+ global $wgGroupPermissions;
+ $newPermissions = $wgGroupPermissions['sysop'];
+ $newPermissions['hideuser'] = true;
+ $this->mergeMwGlobalArrayValue( 'wgGroupPermissions',
+ [ 'sysop' => $newPermissions ] );
+
+ $res = $this->doBlock( [ 'hidename' => '' ] );
+
+ $dbw = wfGetDB( DB_MASTER );
+ $this->assertSame( '1', $dbw->selectField(
+ 'ipblocks',
+ 'ipb_deleted',
+ [ 'ipb_id' => $res[0]['block']['id'] ],
+ __METHOD__
+ ) );
+ }
+
+ public function testBlockWithProhibitedHide() {
+ $this->setExpectedException( ApiUsageException::class,
+ "You don't have permission to hide user names from the block log." );
+
+ $this->doBlock( [ 'hidename' => '' ] );
+ }
+
+ public function testBlockWithEmailBlock() {
+ $res = $this->doBlock( [ 'noemail' => '' ] );
+
+ $dbw = wfGetDB( DB_MASTER );
+ $this->assertSame( '1', $dbw->selectField(
+ 'ipblocks',
+ 'ipb_block_email',
+ [ 'ipb_id' => $res[0]['block']['id'] ],
+ __METHOD__
+ ) );
+ }
+
+ public function testBlockWithProhibitedEmailBlock() {
+ $this->setExpectedException( ApiUsageException::class,
+ "You don't have permission to block users from sending email through the wiki." );
+
+ $this->setMwGlobals( 'wgRevokePermissions',
+ [ 'sysop' => [ 'blockemail' => true ] ] );
+
+ $this->doBlock( [ 'noemail' => '' ] );
+ }
+
+ public function testBlockWithExpiry() {
+ $res = $this->doBlock( [ 'expiry' => '1 day' ] );
+
+ $dbw = wfGetDB( DB_MASTER );
+ $expiry = $dbw->selectField(
+ 'ipblocks',
+ 'ipb_expiry',
+ [ 'ipb_id' => $res[0]['block']['id'] ],
+ __METHOD__
+ );
+
+ // Allow flakiness up to one second
+ $this->assertLessThanOrEqual( 1,
+ abs( wfTimestamp( TS_UNIX, $expiry ) - ( time() + 86400 ) ) );
+ }
- $block = Block::newFromTarget( 'UTApiBlockee' );
+ public function testBlockWithInvalidExpiry() {
+ $this->setExpectedException( ApiUsageException::class, "Expiry time invalid." );
- $this->assertTrue( !is_null( $block ), 'Block is valid.' );
- $this->assertEquals( 'UTApiBlockee', (string)$block->getTarget() );
- $this->assertEquals( 'Some reason', $block->mReason );
- $this->assertEquals( 'infinity', $block->mExpiry );
+ $this->doBlock( [ 'expiry' => '' ] );
}
/**
$this->doApiRequest(
[
'action' => 'block',
- 'user' => 'UTApiBlockee',
+ 'user' => $this->mUser->getName(),
'reason' => 'Some reason',
],
null,
}
public function testDelete() {
- $name = 'Help:ApiDeleteTest_testDelete';
-
- // test non-existing page
- try {
- $this->doApiRequestWithToken( [
- 'action' => 'delete',
- 'title' => $name,
- ] );
- $this->fail( "Should have raised an ApiUsageException" );
- } catch ( ApiUsageException $e ) {
- $this->assertTrue( self::apiExceptionHasCode( $e, 'missingtitle' ) );
- }
+ $name = 'Help:' . ucfirst( __FUNCTION__ );
// create new page
$this->editPage( $name, 'Some text' );
$apiResult = $this->doApiRequestWithToken( [
'action' => 'delete',
'title' => $name,
- ] );
- $apiResult = $apiResult[0];
+ ] )[0];
$this->assertArrayHasKey( 'delete', $apiResult );
$this->assertArrayHasKey( 'title', $apiResult['delete'] );
- // Normalized $name is used
- $this->assertSame(
- 'Help:ApiDeleteTest testDelete',
- $apiResult['delete']['title']
- );
+ $this->assertSame( $name, $apiResult['delete']['title'] );
$this->assertArrayHasKey( 'logid', $apiResult['delete'] );
$this->assertFalse( Title::newFromText( $name )->exists() );
}
+ public function testDeleteNonexistent() {
+ $this->setExpectedException( ApiUsageException::class,
+ "The page you specified doesn't exist." );
+
+ $this->doApiRequestWithToken( [
+ 'action' => 'delete',
+ 'title' => 'This page deliberately left nonexistent',
+ ] );
+ }
+
public function testDeletionWithoutPermission() {
- $name = 'Help:ApiDeleteTest_testDeleteWithoutPermission';
+ $this->setExpectedException( ApiUsageException::class,
+ 'The action you have requested is limited to users in the group:' );
+
+ $name = 'Help:' . ucfirst( __FUNCTION__ );
// create new page
$this->editPage( $name, 'Some text' );
'title' => $name,
'token' => $user->getEditToken(),
], null, null, $user );
- $this->fail( "Should have raised an ApiUsageException" );
- } catch ( ApiUsageException $e ) {
- $this->assertTrue( self::apiExceptionHasCode( $e, 'permissiondenied' ) );
+ } finally {
+ $this->assertTrue( Title::newFromText( $name )->exists() );
+ }
+ }
+
+ public function testDeleteWithTag() {
+ $name = 'Help:' . ucfirst( __FUNCTION__ );
+
+ ChangeTags::defineTag( 'custom tag' );
+
+ $this->editPage( $name, 'Some text' );
+
+ $this->doApiRequestWithToken( [
+ 'action' => 'delete',
+ 'title' => $name,
+ 'tags' => 'custom tag',
+ ] );
+
+ $this->assertFalse( Title::newFromText( $name )->exists() );
+
+ $dbw = wfGetDB( DB_MASTER );
+ $this->assertSame( 'custom tag', $dbw->selectField(
+ [ 'change_tag', 'logging' ],
+ 'ct_tag',
+ [
+ 'log_namespace' => NS_HELP,
+ 'log_title' => ucfirst( __FUNCTION__ ),
+ ],
+ __METHOD__,
+ [],
+ [ 'change_tag' => [ 'INNER JOIN', 'ct_log_id = log_id' ] ]
+ ) );
+ }
+
+ public function testDeleteWithoutTagPermission() {
+ $this->setExpectedException( ApiUsageException::class,
+ 'You do not have permission to apply change tags along with your changes.' );
+
+ $name = 'Help:' . ucfirst( __FUNCTION__ );
+
+ ChangeTags::defineTag( 'custom tag' );
+ $this->setMwGlobals( 'wgRevokePermissions',
+ [ 'user' => [ 'applychangetags' => true ] ] );
+
+ $this->editPage( $name, 'Some text' );
+
+ try {
+ $this->doApiRequestWithToken( [
+ 'action' => 'delete',
+ 'title' => $name,
+ 'tags' => 'custom tag',
+ ] );
+ } finally {
+ $this->assertTrue( Title::newFromText( $name )->exists() );
+ }
+ }
+
+ public function testDeleteAbortedByHook() {
+ $this->setExpectedException( ApiUsageException::class,
+ 'Deletion aborted by hook. It gave no explanation.' );
+
+ $name = 'Help:' . ucfirst( __FUNCTION__ );
+
+ $this->editPage( $name, 'Some text' );
+
+ $this->setTemporaryHook( 'ArticleDelete',
+ function () {
+ return false;
+ }
+ );
+
+ try {
+ $this->doApiRequestWithToken( [ 'action' => 'delete', 'title' => $name ] );
+ } finally {
+ $this->assertTrue( Title::newFromText( $name )->exists() );
}
+ }
+
+ public function testDeleteWatch() {
+ $name = 'Help:' . ucfirst( __FUNCTION__ );
+ $user = self::$users['sysop']->getUser();
+
+ $this->editPage( $name, 'Some text' );
+ $this->assertTrue( Title::newFromText( $name )->exists() );
+ $this->assertFalse( $user->isWatched( Title::newFromText( $name ) ) );
+
+ $this->doApiRequestWithToken( [ 'action' => 'delete', 'title' => $name, 'watch' => '' ] );
+ $this->assertFalse( Title::newFromText( $name )->exists() );
+ $this->assertTrue( $user->isWatched( Title::newFromText( $name ) ) );
+ }
+
+ public function testDeleteUnwatch() {
+ $name = 'Help:' . ucfirst( __FUNCTION__ );
+ $user = self::$users['sysop']->getUser();
+
+ $this->editPage( $name, 'Some text' );
$this->assertTrue( Title::newFromText( $name )->exists() );
+ $user->addWatch( Title::newFromText( $name ) );
+ $this->assertTrue( $user->isWatched( Title::newFromText( $name ) ) );
+
+ $this->doApiRequestWithToken( [ 'action' => 'delete', 'title' => $name, 'unwatch' => '' ] );
+
+ $this->assertFalse( Title::newFromText( $name )->exists() );
+ $this->assertFalse( $user->isWatched( Title::newFromText( $name ) ) );
}
}
dépôts / lhc / web / wiklou.git / commitdiff