Derick Alangi [Mon, 25 Mar 2019 14:20:19 +0000 (15:20 +0100)]
objectcache: Remove unused variable $cache which is overriden
This variable was defined to false and immediately overriden in the
if condition below it which makes the assignment above useless.
Change-Id: Ie72ec7a8860d2a38f59f38b3d861217d39da3e29
jenkins-bot [Mon, 25 Mar 2019 12:42:29 +0000 (12:42 +0000)]
Merge "Add filterFunction to visible{Byte,CodePoint}Limit"
jenkins-bot [Mon, 25 Mar 2019 09:35:22 +0000 (09:35 +0000)]
Merge "db: Drop child methods as they're same as parent methods"
jenkins-bot [Mon, 25 Mar 2019 06:40:12 +0000 (06:40 +0000)]
Merge "docs: Update outdated PageContentSave hook documentation"
jenkins-bot [Mon, 25 Mar 2019 06:33:58 +0000 (06:33 +0000)]
Merge "upload: Simplify file extension extraction in UploadBase"
jenkins-bot [Mon, 25 Mar 2019 04:34:10 +0000 (04:34 +0000)]
Merge "Use the ?? feature instead of isset() where it makes sense"
jenkins-bot [Sun, 24 Mar 2019 23:55:59 +0000 (23:55 +0000)]
Merge "objectcache: remove BagOStuff::mergeViaLock() and update RESTBagOStuff"
Derick Alangi [Sun, 24 Mar 2019 23:29:22 +0000 (00:29 +0100)]
db: Drop child methods as they're same as parent methods
Change-Id: I8b3827a57782f02497da2ab8191d1dad11e92bca
Thiemo Kreuz [Sun, 24 Mar 2019 21:40:49 +0000 (22:40 +0100)]
Use the ?? feature instead of isset() where it makes sense
Change-Id: I3a54f36b33d99ef3ff4c63e32e7dfcbcfc296135
Reedy [Sun, 24 Mar 2019 20:47:24 +0000 (20:47 +0000)]
Fix off by 1 error when displaying the number of a line with an error
Change-Id: I876ba04f6903127a9d5adedfe0a5e2598a90068c
jenkins-bot [Sun, 24 Mar 2019 20:56:49 +0000 (20:56 +0000)]
Merge "Use foreach for readability"
jenkins-bot [Sun, 24 Mar 2019 20:36:56 +0000 (20:36 +0000)]
Merge "make xml abstracts, stubs and page log dumps work again"
Reedy [Sun, 24 Mar 2019 20:14:07 +0000 (20:14 +0000)]
Use foreach for readability
Change-Id: Ia4701bc50d8c57b9dcafe2da3bb399d59f4c8d0e
Thiemo Kreuz [Sun, 24 Mar 2019 14:04:32 +0000 (15:04 +0100)]
Make use of the list() feature where it makes sense
This code is functionally identical, but less error prone (not so easy
to forget or mix these numerical indexes).
This patch happens to touch the Parser, which might be a bit scary. We
can remove this file from this patch if you prefer.
Change-Id: I8cbe3a9a6725d1c42b86e67678c1af15fbc5961a
Ariel T. Glenn [Sun, 24 Mar 2019 11:43:37 +0000 (13:43 +0200)]
make xml abstracts, stubs and page log dumps work again
Broken in I979b6c8f0a72bc1f5ecce1d499d3fdfa0f671588
Bug: T174031
Change-Id: I494fe7578f936a2316c27f9c419e981055c38ed4
Aaron Schulz [Wed, 20 Mar 2019 18:11:00 +0000 (11:11 -0700)]
objectcache: remove BagOStuff::mergeViaLock() and update RESTBagOStuff
All subclasses are now using the CAS variant, which respects $attempts.
Change-Id: Ia7ec6a7f3337cabe95c54c1142c3c5464c1794e7
Aaron Schulz [Sun, 24 Mar 2019 03:07:56 +0000 (20:07 -0700)]
Fix overzealous prefix check in MWLBFactory
Follow-up
9df277a4ba3
If the server array ommitted 'tablePrefix', Database will
use '' as the prefix, so if $wgDBprefix is also '', then
no error should happen.
Change-Id: Ic207c3fceae8fd45c87f7fa24678079217a60730
jenkins-bot [Sun, 24 Mar 2019 02:47:26 +0000 (02:47 +0000)]
Merge "Fix PhanPluginDuplicateConditional* errors (#1)"
jenkins-bot [Sun, 24 Mar 2019 02:25:15 +0000 (02:25 +0000)]
Merge "Upgrade to newer phan"
jenkins-bot [Sun, 24 Mar 2019 02:25:05 +0000 (02:25 +0000)]
Merge "session: Fix missing return in SessionBackend::resetId()"
jenkins-bot [Sun, 24 Mar 2019 02:22:58 +0000 (02:22 +0000)]
Merge "API: Fix missing return in ApiResult::addContentValue()"
Max Semenik [Sun, 24 Mar 2019 01:52:13 +0000 (18:52 -0700)]
Disable flapping MessageCacheTest::testLoadFromDB_fetchLatestRevision()
Bug: T219042
Bug: T218918
Change-Id: I93ed4d088691bfc50aeef1f9c07af5a6dc50de4b
Kunal Mehta [Fri, 22 Mar 2019 00:21:22 +0000 (17:21 -0700)]
Fix PhanPluginDuplicateConditional* errors (#1)
Change-Id: I61e4d4a60dda27f43debab71a9c02f14c1468311
Kunal Mehta [Thu, 21 Mar 2019 23:59:32 +0000 (16:59 -0700)]
Upgrade to newer phan
MediaWiki core now runs phan 1.2.6, bringing in nearly 2+ years of upstream
fixes.
Configuration was moved from `tests/phan` to `.phan/`. The legacy bash wrapper
script is still kept in the repository in its own location for any extensions
that are still using it. It should be removed before 1.33 is released.
Since there's a lot of new issues being flagged, all currently failing issues
are suppressed, and will be fixed in follow-up patches.
We're dropping the jetbrains/phpstorm-stubs repository in favor of just
the minimal stubs we need. Stubs for PHP extensions are kept in
the new `.phan/internal_stubs` directory, since they're in a slightly
different format than normal stubs.
Normal stubs are kept in `.phan/stubs`. wikidiff2 and excimer are kept with
these since we're also the upstream for them.
Change-Id: I3fe437befa17f4fbaf97aa6271f659b56021f396
Kunal Mehta [Sun, 24 Mar 2019 00:10:36 +0000 (17:10 -0700)]
session: Fix missing return in SessionBackend::resetId()
Spotted by phan.
Change-Id: Ic11864916d50e79031c30a0e74dbbcf548ce31a0
Kunal Mehta [Sun, 24 Mar 2019 00:10:18 +0000 (17:10 -0700)]
API: Fix missing return in ApiResult::addContentValue()
Spotted by phan.
Change-Id: Ifca5e15a1360008b5d91e1b6f483da8e0367819a
jenkins-bot [Sat, 23 Mar 2019 23:35:29 +0000 (23:35 +0000)]
Merge "add lbzip2 output processor for exports"
Ariel T. Glenn [Wed, 20 Mar 2019 05:25:06 +0000 (07:25 +0200)]
add lbzip2 output processor for exports
Bug: T214293
Change-Id: I98e26b833df473bbeb3dc1b881f428174d776b64
jenkins-bot [Sat, 23 Mar 2019 22:37:10 +0000 (22:37 +0000)]
Merge "Move class RevisionListBase and friends to own file"
jenkins-bot [Sat, 23 Mar 2019 21:20:04 +0000 (21:20 +0000)]
Merge "Do not suppress php notices in SpecialPageFatalTest"
jenkins-bot [Sat, 23 Mar 2019 18:59:26 +0000 (18:59 +0000)]
Merge "block: Avoid use of empty() which doesn't warn on var non-existence"
jenkins-bot [Sat, 23 Mar 2019 08:28:35 +0000 (08:28 +0000)]
Merge "Remove reliance on Block properties being public"
jenkins-bot [Sat, 23 Mar 2019 07:59:27 +0000 (07:59 +0000)]
Merge "Avoid the use of IDatabase::insert() return value"
jenkins-bot [Sat, 23 Mar 2019 04:31:08 +0000 (04:31 +0000)]
Merge "rdbms: halt on some common broken $wgDBServers configurations"
jenkins-bot [Fri, 22 Mar 2019 23:47:31 +0000 (23:47 +0000)]
Merge "registration: Fix if or elseif constructs with return statements"
Derick Alangi [Fri, 22 Mar 2019 23:10:41 +0000 (00:10 +0100)]
block: Avoid use of empty() which doesn't warn on var non-existence
As empty() is more tolerant and doesn't warn on variable non-existence
and will go ahead and treat it as if it has the value null, it's better
to use ! in this case to make sure we catch even things like typos in
the variable names within the code base.
Let's make sure intended checks are actually checked instead of being
tolerant. Follow up on: Ibaf555fac293da46fa397ccb9, thanks @Krinkle.
Change-Id: Ibc45dba373bbbb6735a9681ed07a2438d4073ee0
Derick Alangi [Fri, 22 Mar 2019 22:36:11 +0000 (23:36 +0100)]
registration: Fix if or elseif constructs with return statements
Change-Id: I7abd09d8959daddaa161bd92a1b1b23a4abbab32
Thalia [Fri, 22 Mar 2019 15:16:40 +0000 (15:16 +0000)]
Remove reliance on Block properties being public
Use getters and setters for $mReason, $mTimestamp, $mExpiry and
$mHideName; use Block::getType to check if a block is an autoblock
instead of checking $mAuto; no change needed for $mParentBlockId,
which is not accessed externally.
Change-Id: I767ed44ce4c2e21f53962d75fb86891add2282f6
Derick Alangi [Fri, 22 Mar 2019 21:12:09 +0000 (22:12 +0100)]
Avoid the use of IDatabase::insert() return value
Change-Id: Ibaf555fac293da46fa397ccb993cfb61bfcd67aa
Translation updater bot [Fri, 22 Mar 2019 20:59:25 +0000 (21:59 +0100)]
Localisation updates from https://translatewiki.net.
Change-Id: I0b1430a5ae16b2b048e6b7467991c5e53aa18dd1
jenkins-bot [Fri, 22 Mar 2019 19:13:06 +0000 (19:13 +0000)]
Merge "Update OOUI to v0.31.1"
Lucas Werkmeister [Fri, 22 Mar 2019 12:47:05 +0000 (13:47 +0100)]
Add filterFunction to visible{Byte,CodePoint}Limit
The underlying {byte,codePoint}Limit functions already supported this
parameter to apply to the string before limiting the length; add it to
the visible limiting functions as well, displaying the remaining
characters after the text is filtered.
Change-Id: Id8f039ef21ed64dd97c6711efa56d59bb0264669
jenkins-bot [Fri, 22 Mar 2019 15:44:59 +0000 (15:44 +0000)]
Merge "User::(get|is)Block*(): We don't need to prefix variables with their type…"
jenkins-bot [Fri, 22 Mar 2019 15:35:58 +0000 (15:35 +0000)]
Merge "Only load latest revision in MessageCache::loadFromDB"
daniel [Fri, 22 Mar 2019 12:26:21 +0000 (13:26 +0100)]
Only load latest revision in MessageCache::loadFromDB
In Id044b8dcd7c, we lost a condition that ensured that the cache would
be populated with the latest revision. Now it was being populated with
all revisions, with a random one winning.
Bug: T218918
Change-Id: I1a47356ea35f0abf35bb1a3489d0d3442a3400a5
Reedy [Mon, 18 Mar 2019 22:17:50 +0000 (22:17 +0000)]
User::(get|is)Block*(): We don't need to prefix variables with their type…
Change-Id: I38e10453051dd300217542de68daab352993b2a6
jenkins-bot [Fri, 22 Mar 2019 11:43:27 +0000 (11:43 +0000)]
Merge "Remove i18n parameters"
Gabriel Birke [Fri, 22 Mar 2019 11:10:45 +0000 (12:10 +0100)]
Remove i18n parameters
Since the confirmation message can no longer show the edit count, remove
the data attribute that contains it.
Also make the selector for the confirmation more specific.
This is a followup for change 498096
Bug: T218354
Change-Id: I08dd75d3b161d7869357e486b25693dde635eb14
addshore [Fri, 22 Mar 2019 10:25:11 +0000 (11:25 +0100)]
Fix WANObjectCache typo in phpdoc
Change-Id: I6b9d68bc4832fe71217d5c0ef66bebdfa9b459ce
jenkins-bot [Fri, 22 Mar 2019 09:22:41 +0000 (09:22 +0000)]
Merge "don't die producing xml files if rev text export conversion fails"
Aaron Schulz [Fri, 22 Mar 2019 07:17:36 +0000 (00:17 -0700)]
rdbms: halt on some common broken $wgDBServers configurations
Mention the changes, usually simple, needed to fix the problem.
Bug: T215850
Change-Id: I9911f5f5213682ffb52ac548e3082db548e37b3d
jenkins-bot [Fri, 22 Mar 2019 06:13:28 +0000 (06:13 +0000)]
Merge "Use mediawiki/mediawiki-phan-config 0.3.0"
Kunal Mehta [Thu, 21 Mar 2019 22:28:48 +0000 (15:28 -0700)]
Use mediawiki/mediawiki-phan-config 0.3.0
Use the library instead of duplicating most of the config/defaults that it
provides. MediaWiki core is different of course, so we have to override a
bunch of file/directory lists, but there was a lot being duplicated.
This is the first step in migrating to a newer phan version.
Change-Id: Ib5987ebdf208138d97e1aba8ef54438064063fe9
jenkins-bot [Fri, 22 Mar 2019 02:00:20 +0000 (02:00 +0000)]
Merge "rdbms: avoid connections on more lazy DBConnRef methods"
jenkins-bot [Fri, 22 Mar 2019 00:41:00 +0000 (00:41 +0000)]
Merge "rdbms: update wasQueryTimeout() for DatabaseMysqlBase"
jenkins-bot [Fri, 22 Mar 2019 00:39:12 +0000 (00:39 +0000)]
Merge "rdbms: add 1062 error code to DatabaseMysqlBase"
Aaron Schulz [Thu, 21 Mar 2019 12:51:28 +0000 (05:51 -0700)]
rdbms: avoid connections on more lazy DBConnRef methods
Also:
* Fixed LoadBalancer::getAnyOpenConnection for both
DB_MASTER and DB_REPLICA, which are not real indexes.
* Lock down DBConnRef::close since it can only cause trouble.
* Relax DBConnRef restrictions on tablePrefix()/dbSchema()
for the harmless "getter" mode case.
* Remove redundant DatabasePostgres::getServer definition.
Change-Id: Ia855d901cc3c28147e52284fdabb1645805d4466
jenkins-bot [Fri, 22 Mar 2019 00:30:53 +0000 (00:30 +0000)]
Merge "Support more coupled DBs in AtomicSectionUpdate/AutoCommitUpdate"
Aaron Schulz [Thu, 21 Mar 2019 21:22:34 +0000 (14:22 -0700)]
rdbms: update wasQueryTimeout() for DatabaseMysqlBase
Change-Id: I533d68972c758a5c8bb251cd838b8802799f0318
jenkins-bot [Fri, 22 Mar 2019 00:19:30 +0000 (00:19 +0000)]
Merge "rdbms: make LBFactory::setLocalDomainPrefix preserve the schema"
Aaron Schulz [Thu, 21 Mar 2019 23:54:46 +0000 (16:54 -0700)]
rdbms: add 1062 error code to DatabaseMysqlBase
See https://dev.mysql.com/doc/refman/5.7/en/server-error-reference.html
Change-Id: Id4960a5693332e6291ddcb5564bf6f8177a90c3d
jenkins-bot [Fri, 22 Mar 2019 00:14:45 +0000 (00:14 +0000)]
Merge "Title: Test the ->equals() method more thoughroughly"
jenkins-bot [Fri, 22 Mar 2019 00:13:05 +0000 (00:13 +0000)]
Merge "Fix fatal due to lock name mismatch in Maintenance::unlockSearchindex"
jenkins-bot [Fri, 22 Mar 2019 00:05:01 +0000 (00:05 +0000)]
Merge "rdbms: restrict more unsafe IDatabase methods in DBConnRef"
jenkins-bot [Thu, 21 Mar 2019 23:55:30 +0000 (23:55 +0000)]
Merge "objectcache: convert APC and hash BagOStuff to using mergeViaCas()"
jenkins-bot [Thu, 21 Mar 2019 23:55:20 +0000 (23:55 +0000)]
Merge "objectcache: optimize merge()/incr() for WinCacheBagOStuff"
James D. Forrester [Sat, 16 Mar 2019 19:40:13 +0000 (12:40 -0700)]
Title: Test the ->equals() method more thoughroughly
Move from TitleMethodTest to TitleTest for simplicity with duplicating
into TitleValueTest. We're not using the language- and namespace-specific
test setup with these tests anyway.
Change-Id: Ieec78c35f04faea5e01da8d39ed88f7c4876ac84
jenkins-bot [Thu, 21 Mar 2019 23:52:50 +0000 (23:52 +0000)]
Merge "Fix phpstorm IDEA errors in SkinTemplate"
Aaron Schulz [Thu, 21 Mar 2019 23:17:25 +0000 (16:17 -0700)]
rdbms: restrict more unsafe IDatabase methods in DBConnRef
Change-Id: I1933da825e6b20b4ec742e0aa39d63e9a75f9a1c
jenkins-bot [Thu, 21 Mar 2019 22:45:50 +0000 (22:45 +0000)]
Merge "Do not create new archive file names for old files"
jenkins-bot [Thu, 21 Mar 2019 22:03:18 +0000 (22:03 +0000)]
Merge "RevDel: Avoid log_search rows with empty values for target_author_actor"
Translation updater bot [Thu, 21 Mar 2019 21:12:00 +0000 (22:12 +0100)]
Localisation updates from https://translatewiki.net.
Change-Id: I0dd7b417499db34a6b99d3491c34e361e84a5b9e
Aaron Schulz [Thu, 21 Mar 2019 21:05:35 +0000 (14:05 -0700)]
Support more coupled DBs in AtomicSectionUpdate/AutoCommitUpdate
This is useful for updating a secondary database based on a
commit to the main one, especially for using auto-commit.
Change-Id: Iad9084d2fb0490ecdfd5fcc97db33bfbcbfa5d21
Brad Jorsch [Thu, 7 Feb 2019 16:16:32 +0000 (11:16 -0500)]
RevDel: Avoid log_search rows with empty values for target_author_actor
During migration, RevDel may wind up being used on items where an actor
has not been assigned yet. The code creating log_search rows for
target_author_actor needs to take this into account.
Also, to clean this up on Wikimedia wikis, I've added code to
MigrateActors to delete these rows before (re-)migrating log_search
and a --tables option so a re-run can skip trying to process all the
already-processed tables (cf. T188327#
4892827).
Bug: T215525
Change-Id: Ica15e2e30445e23761e6d3d6405b3eb39a086161
Fomafix [Thu, 21 Mar 2019 19:36:52 +0000 (20:36 +0100)]
WebRequest: Simplify getGPCVal
* Call $contLang->checkTitleEncoding() only with a string value as
parameter. (A boolean value here caused T218883.)
* MediaWikiServices::getInstance()->getContentLanguage() always return a
Language object. An exist check is not necessary.
Change-Id: Idd3e3a2baa5072e862d7502e30079a1b33d6a866
jenkins-bot [Thu, 21 Mar 2019 17:35:46 +0000 (17:35 +0000)]
Merge "Use delegated events for rollback confirmable"
jenkins-bot [Thu, 21 Mar 2019 17:35:36 +0000 (17:35 +0000)]
Merge "Rearrange code in User::getBlockedStatus to avoid isAllowed calls"
Tim Eulitz [Thu, 21 Mar 2019 14:07:28 +0000 (15:07 +0100)]
Use delegated events for rollback confirmable
This change is necessary to make the rollback confirmation work even
when the list of items which can be rolled back is updated via
JavaScript (this is possible on RecentChanges, for example).
Bug: T218354
Change-Id: Idafe1380b283cf0056ff1efdffa04aca92cf1217
jenkins-bot [Thu, 21 Mar 2019 16:25:37 +0000 (16:25 +0000)]
Merge "Fixed typo 'implments' and 'implmented'"
James D. Forrester [Thu, 21 Mar 2019 16:15:22 +0000 (09:15 -0700)]
Update OOUI to v0.31.1
Release notes:
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.31.1
Bug: T163135
Bug: T170263
Bug: T184835
Bug: T209716
Bug: T214748
Bug: T216071
Bug: T216780
Bug: T218409
Bug: T218722
Bug: T218753
Depends-On: I79088caef4a34b3f6ae06bff25213652a079854a
Change-Id: I79088caef4a34b3f6ae06bff25213652a079854b
jenkins-bot [Thu, 21 Mar 2019 16:08:56 +0000 (16:08 +0000)]
Merge "Remove deprecated handling of multiple arguments by the Block constructor"
Gergő Tisza [Thu, 21 Mar 2019 16:00:49 +0000 (09:00 -0700)]
Rearrange code in User::getBlockedStatus to avoid isAllowed calls
User::isAllowed() triggers session loading, which results in a loop
if it is called during session loading. Session providers need to
check block status when $wgBlockDisablesLogin is enabled, so try to
avoid isAllowed calls in that situation.
Bug: T218608
Change-Id: Iab24923c613d6aeed4b574f587fc4cee8f33077c
didicodes [Thu, 21 Mar 2019 15:10:02 +0000 (16:10 +0100)]
Fixed typo 'implments' and 'implmented'
Changed implments to implements
Changed implmented to implemented
Bug: T201491
Change-Id: I369a0079211ca798c6d44fb570035438769bfc32
jenkins-bot [Thu, 21 Mar 2019 15:12:36 +0000 (15:12 +0000)]
Merge "languages: Partial revert of I8287118cf8ec01326ead9"
jenkins-bot [Thu, 21 Mar 2019 14:36:02 +0000 (14:36 +0000)]
Merge "Correct API documentation for action=parse&prop=headhtml"
Thalia [Thu, 21 Mar 2019 14:34:48 +0000 (14:34 +0000)]
Remove deprecated handling of multiple arguments by the Block constructor
Also remove test for the deprecated functionality.
Bug: T218892
Change-Id: I37ab858494a173c6982bb16bf1c362d5dd790e23
Derick Alangi [Thu, 21 Mar 2019 14:26:16 +0000 (15:26 +0100)]
languages: Partial revert of I8287118cf8ec01326ead9
Fix bad value for parameter $s: must be a string production error.
Bug: T218883
Change-Id: I550f6cbc7fa9d290001ae0f2454cd1a46e672e0c
jenkins-bot [Thu, 21 Mar 2019 14:03:21 +0000 (14:03 +0000)]
Merge "Fix account create checkbox bug"
Tim Eulitz [Mon, 4 Mar 2019 15:40:45 +0000 (16:40 +0100)]
Implement temporary rollback confirmation toggle
This change implements a temporary feature toggle for the rollback
confirmation change. The main purpose is to allow users of certain wikis
(de-wiki, pl-wiki, for example) to turn off this upcoming feature before
it is released to production.
Bug: T217039
Change-Id: I6ed59afde5b75756053da3ae46858304dda9317d
jenkins-bot [Thu, 21 Mar 2019 12:56:17 +0000 (12:56 +0000)]
Merge "collation: Use `self` to reference same class instead of class name"
jenkins-bot [Thu, 21 Mar 2019 12:00:33 +0000 (12:00 +0000)]
Merge "Make the XML dump schema version configurable."
jenkins-bot [Thu, 21 Mar 2019 12:00:23 +0000 (12:00 +0000)]
Merge "Implement non-JS RollbackAction with form"
daniel [Fri, 14 Dec 2018 11:24:44 +0000 (12:24 +0100)]
Make the XML dump schema version configurable.
Bug: T174031
Change-Id: I979b6c8f0a72bc1f5ecce1d499d3fdfa0f671588
Tim Eulitz [Mon, 18 Feb 2019 13:32:05 +0000 (14:32 +0100)]
Implement non-JS RollbackAction with form
This change prepares a form for the RollbackAction to allow rollbacks to
be triggered via POST while also ensuring users are always prompted with
a request to confirm the rollback if the rollback confirmation prompt is
enabled.
Bug: T215303
Change-Id: Iaf7e095b3bb34072eea6bcac76ba29358b14cc09
tzhelyazkova [Thu, 28 Feb 2019 16:58:57 +0000 (17:58 +0100)]
Count number of usages for Rollback Confirmation Prompt
Bug: T215796
Change-Id: If8536955f4988440af053525ec9d761d4a60794c
jenkins-bot [Thu, 21 Mar 2019 10:54:16 +0000 (10:54 +0000)]
Merge "Add optional jQuery event delegates in Confirmable"
Thiemo Kreuz [Wed, 2 Jan 2019 14:34:59 +0000 (15:34 +0100)]
Do not create new archive file names for old files
When importing a previously archived file revision, \OldLocalFile::uploadOld()
calls \LocalFile::publishTo() with $dstRel pointing to a location in the
archive. It does not make sense to create a new archive file name for a file
that is already in the archive. Instead, use the existing archive file name.
* Note how $archiveName is not used in the code below, except as part of the
returned status.
* $archiveRel ends in \FileRepo::publishBatch(), but is barely used there
except for (again) the status.
* \FileRepo::publishBatch() makes use of the dirname() extracted from
$archiveRel. This patch does not make changes to this path, only to the
file name.
This is the most trivial patch we could think of to fix the bug that the
return value is not the documented one ("On success, the value member
contains the archive name").
This will be covered by the test introduced in I15fad26.
Bug: T200001
Bug: T210755
Change-Id: I28b782e9b41ed78ac1674111094335849e15ba49
Tim Eulitz [Tue, 5 Feb 2019 13:31:53 +0000 (14:31 +0100)]
Show confirmation prompt on rollback links
Bug: T215020
Change-Id: Ic831888e30808a20a04397912498fe2ca04f80ba
jenkins-bot [Thu, 21 Mar 2019 10:10:34 +0000 (10:10 +0000)]
Merge "Add a user preference to opt in or out of a confirmation prompt for rollbacks."
jenkins-bot [Thu, 21 Mar 2019 08:47:34 +0000 (08:47 +0000)]
Merge "resources: Add verifiable upstream for various jquery plugins"