Timo Tijhof [Sun, 18 Mar 2018 04:03:42 +0000 (21:03 -0700)]
Convert OutputHandler functions to a class
* Convert OutputHandler.php from global functions to a class.
- wfOutputHandler → OutputHandler::handle
(no alias, no usage outside core)
- wfGzipHandler → OutputHandler::handleGzip
(private, no usage outside class)
- wfRequestExtension → OutputHandler::findUriExtension
(private, no usage outside class)
- wfMangleFlashPolicy → OutputHandler::mangleFlashPolicy
(private, no usage outside class)
- wfDoContentLength → OutputHandler::emitContentLength
(private, no usage outside class)
- wfHtmlValidationHandler → OutputHandler::validateAllHtml
(private, no usage outside class)
* Add the class to autoload.php for exposure outside WebStart.
Specifically, for use in ApiFormatPhpTest. This also removes the
need to manually load the class because this code runs after
Setup.php loads AutoLoader.php.
Bug: T189966
Change-Id: I27a41ec0ae0ee30aeb313a616323b967605c4055
Timo Tijhof [Sun, 18 Mar 2018 04:33:32 +0000 (21:33 -0700)]
parser: Update MWTidy::checkErrors() error message
When setting the following on PHP 7, the produced error message
did not make sense (references something about HHVM).
> $wgValidateAllHtml = true
> $wgTidyConfig = ['driver' => 'RemexHtml'];
Change-Id: I5f14505639a79aca66f570a9a00c38cdea0cc1ba
jenkins-bot [Wed, 21 Mar 2018 00:29:39 +0000 (00:29 +0000)]
Merge "HTMLSizeFilterField: Add OOUI version"
Timo Tijhof [Mon, 5 Mar 2018 23:15:24 +0000 (15:15 -0800)]
resourceloader: Remove redundant state assignment for styles in ClientHtml
The same variable index was set to the same value from two places,
one unconditionally, and two times within a conditional block after
the first one.
The second ones are a completely redundant remnant from a refactor
sometime last year.
Change-Id: Ia234d4aca398b1b365d457a439d9e449229f28fb
Translation updater bot [Tue, 20 Mar 2018 20:56:11 +0000 (21:56 +0100)]
Localisation updates from https://translatewiki.net.
Change-Id: Ie14e1f3bd7c920c93c0fb9d73619985125a5fc08
jenkins-bot [Tue, 20 Mar 2018 20:20:08 +0000 (20:20 +0000)]
Merge "rdbms: upgrade transaction misuse warnings to exceptions"
jenkins-bot [Tue, 20 Mar 2018 17:51:28 +0000 (17:51 +0000)]
Merge "phpunit: Add some @covers and @large/@medium to integration tests"
Aaron Schulz [Fri, 9 Mar 2018 00:58:48 +0000 (16:58 -0800)]
rdbms: upgrade transaction misuse warnings to exceptions
The last warnings in logstash for WMF have been cleaned up
Change-Id: I7d5bb624bc583191c3a0c95aa4e99322d6d5008c
Timo Tijhof [Tue, 20 Mar 2018 16:14:34 +0000 (09:14 -0700)]
phpunit: Add some @covers and @large/@medium to integration tests
- @small: single class, no I/O (unit test).
- @medium: multi-class (partial or no mocks), no I/O (unit/integration test).
- @large: multi-class, I/O allowed (integration test).
Change-Id: I09317e6dd9b0ee34b7467fbffdd07957ef55dc04
Subramanya Sastry [Tue, 20 Mar 2018 16:09:40 +0000 (11:09 -0500)]
Sync up with Parsoid parserTests.txt
This now aligns with Parsoid commit
3f79aa9fd48e68d32d1b9bdc3e29ec4536f297b8
Change-Id: I12249e39ddc6e3344a9dd8a1545b129ed469e184
Aryeh Gregor [Tue, 20 Mar 2018 16:01:07 +0000 (18:01 +0200)]
Test ApiDisabled.php
Locally this reports that everything is covered, although the get*()
functions are not registering at all (white backgrounds).
Change-Id: I73fabfb33b329dc3416368fda52d35f7ee6a4a18
jenkins-bot [Tue, 20 Mar 2018 15:26:06 +0000 (15:26 +0000)]
Merge "RFC T157418: Trim whitespace in table cells, list items, headings"
Aaron Schulz [Tue, 20 Mar 2018 14:46:16 +0000 (07:46 -0700)]
rdbms: fix bogus $fname parameter in LoadMonitorMySQL
Change-Id: Ib8862532362da148ddd6296646fba7483c6463d5
jenkins-bot [Tue, 20 Mar 2018 12:06:32 +0000 (12:06 +0000)]
Merge "MCR: replace slot_inherited with slot_origin"
jenkins-bot [Tue, 20 Mar 2018 11:19:51 +0000 (11:19 +0000)]
Merge "Revert "Selenium: configuration file for beta cluster""
Zfilipin [Tue, 20 Mar 2018 11:12:27 +0000 (11:12 +0000)]
Revert "Selenium: configuration file for beta cluster"
This reverts commit
3d2395a2af962b9bb941f3bbd819578f2b6b2d65.
Change-Id: I4ad8958df097a1ef011c0f9d99ea9f7a0030c032
jenkins-bot [Tue, 20 Mar 2018 04:21:12 +0000 (04:21 +0000)]
Merge "Set WebInstaller session variables as globals"
Brion Vibber [Fri, 9 Mar 2018 19:54:19 +0000 (11:54 -0800)]
Fix XMPReader/XMPValidator for PHP 7
Tripped up by old typos being caught in new warnings on
PHP 7.x: was checking a scalar's count when meant to
check its containing array's count, and was using a str
"\0" where a literal 0 should have been used (now considered
non-numeric).
Tested locally on 7.2
Bug: T182365
Change-Id: If79a73032d6b63cc41135ccafb6900aeb7787b02
jenkins-bot [Tue, 20 Mar 2018 02:41:28 +0000 (02:41 +0000)]
Merge "rdbms: add IDatabase::wasConnectionLoss() method"
Gergő Tisza [Tue, 20 Mar 2018 01:35:43 +0000 (18:35 -0700)]
Set WebInstaller session variables as globals
During the install process LocalSettings.php does not exist
yet so globals simply take their values from DefaultSettings.php.
The installer uses the correct settings directly for e.g. database
operations, but this blows up when something tries to use
MediaWikiServices which is hardcoded to work with globals.
Make the installer update the globals to work around this.
Bug: T187586
Change-Id: I042099c399bc58929e83178f61e6e6ca478a3ee6
Aaron Schulz [Mon, 19 Mar 2018 23:20:15 +0000 (16:20 -0700)]
rdbms: clean up DBO_TRX behavior for onTransactionPreCommitOrIdle()
* Make sure cancelled onTransactionPreCommitOrIdle() callbacks do not
run if a transaction round is rolled back and then a second round is
committed. LoadBalancer::rollbackMasterChanges() now always calls
rollback(), which in turn always cleans up such callbacks.
* Remove error logging for rollback() calls when trxLevel = 0; this is
harmless and is sometimes hard to avoid in error handling anyway.
* Add more related unit tests.
Change-Id: I6bdefe8bf8b6630fc252b5bbafe4808758ba1684
Aaron Schulz [Tue, 20 Mar 2018 00:26:49 +0000 (17:26 -0700)]
rdbms: add IDatabase::wasConnectionLoss() method
This takes the logic from wasErrorReissuable(), but puts it under
better name. The way that method was used, as well its comments,
were only about connection loss.
Make wasErrorReissuable() check if there was any error that
does not preclude the ability to retry. This matches the actual
name of the method.
Also improve some other related comments.
Change-Id: I68455d803afb2370897fecab0e79aadbb5d1a740
Aaron Schulz [Tue, 20 Mar 2018 01:08:37 +0000 (18:08 -0700)]
rdbms: define wasLockTimeout() for postgres
Change-Id: Ic54530f0b48fb3e3a42c1e6e95a5a75c6b5c061d
Aaron Schulz [Tue, 20 Mar 2018 00:17:24 +0000 (17:17 -0700)]
rdbms: cleanup runMasterPostTrxCallbacks() transaction check
This does not actually care about pending callbacks, and indeed there
are expected to likely be some (which it runs a few lines later).
Change-Id: If966a518893dedeb48bbeca87daedb417e5abd92
Translation updater bot [Mon, 19 Mar 2018 21:02:15 +0000 (22:02 +0100)]
Localisation updates from https://translatewiki.net.
Change-Id: I484a2f4f3606d6a6aab12011a8ce7ab7379ea3e6
daniel [Tue, 6 Mar 2018 14:42:43 +0000 (15:42 +0100)]
MCR: replace slot_inherited with slot_origin
Bug: T189004
Change-Id: Ie9dbda3296a71f584c82a5f275098adc225a53d5
jenkins-bot [Mon, 19 Mar 2018 20:45:19 +0000 (20:45 +0000)]
Merge "Rewrite passwordtoopopular message"
jenkins-bot [Mon, 19 Mar 2018 20:43:51 +0000 (20:43 +0000)]
Merge "Pass revision being reverted to edit code"
jenkins-bot [Mon, 19 Mar 2018 20:14:12 +0000 (20:14 +0000)]
Merge "Add default for revision.rev_text_id where missing"
Framawiki [Mon, 19 Mar 2018 18:51:02 +0000 (19:51 +0100)]
Rewrite passwordtoopopular message
Bug: T177018
Change-Id: Ie0b6a6f26de0271935514fc0764d4894ef0975f4
addshore [Mon, 12 Mar 2018 16:21:02 +0000 (16:21 +0000)]
Add default for revision.rev_text_id where missing
This adds a default of 0 for:
- Mssql
- Mysql
- Sqlite
The field is already NULLable in:
- Oracle
- Postgres
Bug: T188741
Change-Id: Ibe1cc363d21fb96f38c263181bf30a429a1c7b45
Ed Sanders [Mon, 19 Mar 2018 14:28:28 +0000 (14:28 +0000)]
Create save/publish buttons labels with ellipses
To be used by editors which launch a dialog to
finish off the save/publish process (e.g. VE).
Bug: T189803
Change-Id: Ic29717a660de5e80ee2a37f583b2a61c11fa87c4
jenkins-bot [Mon, 19 Mar 2018 06:45:19 +0000 (06:45 +0000)]
Merge "mediawiki.util: Document isIPAddress() allowBlock as optional"
jenkins-bot [Mon, 19 Mar 2018 03:54:13 +0000 (03:54 +0000)]
Merge "Fix WikiPageDbTestBase::testNewFromId_returnsNullOnNonExistingId"
Timo Tijhof [Mon, 19 Mar 2018 03:32:05 +0000 (20:32 -0700)]
mediawiki.util: Document isIPAddress() allowBlock as optional
This was already the case in the code, but the documentation
was not reflecting this accurately. Passing 'false' as second
parameter is not desirable in most cases.
Change-Id: Idbbd7de795b444e401a16292dfb8c9a80f4d07be
jenkins-bot [Mon, 19 Mar 2018 01:44:06 +0000 (01:44 +0000)]
Merge "Move image_comment_temp entries when the file is moved"
jenkins-bot [Sun, 18 Mar 2018 22:36:44 +0000 (22:36 +0000)]
Merge "Remove @dataProvider and @covers from non-test functions"
jenkins-bot [Sun, 18 Mar 2018 22:24:09 +0000 (22:24 +0000)]
Merge "Remove unused HashRing::newWithoutLocation() method"
Umherirrender [Fri, 16 Mar 2018 16:50:59 +0000 (17:50 +0100)]
Remove @dataProvider and @covers from non-test functions
Only functions beginning with test* should have that annotation
Change-Id: I85cd795970205943aebe692d85434145b3cf3f5b
jenkins-bot [Sun, 18 Mar 2018 22:19:35 +0000 (22:19 +0000)]
Merge "Set visiblity of some HashRing methods"
Kunal Mehta [Tue, 6 Mar 2018 01:14:07 +0000 (17:14 -0800)]
Use SPDX 3.0 license identifier
SPDX released version 3 of their license list (<https://spdx.org/licenses/>),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.
Bug: T183858
Change-Id: I4cbb98ea2bbacf46a57401dbba2bdb076fca1d3a
Brad Jorsch [Sun, 18 Mar 2018 15:37:05 +0000 (11:37 -0400)]
Move image_comment_temp entries when the file is moved
Bug: T189985
Change-Id: I437102d62cb94fd3195ff06ee8185ce5a2dc941e
Aaron Schulz [Sun, 18 Mar 2018 04:24:26 +0000 (21:24 -0700)]
Remove unused HashRing::newWithoutLocation() method
Change-Id: I6f149b2ef2e7e9fe2e7ddbda6c0c7d795c24720e
Aaron Schulz [Sun, 18 Mar 2018 04:22:56 +0000 (21:22 -0700)]
Set visiblity of some HashRing methods
* getLiveRing() is now protected
* getLocation() is now final
Change-Id: I16002fe7187d8bbb6e36d4dd9a1302ee1d46a4bb
jenkins-bot [Sun, 18 Mar 2018 05:19:04 +0000 (05:19 +0000)]
Merge "Normalize PHPDoc attributes"
jenkins-bot [Sun, 18 Mar 2018 05:16:24 +0000 (05:16 +0000)]
Merge "Don't use deprecated NS_IMAGE*"
jenkins-bot [Sun, 18 Mar 2018 05:06:21 +0000 (05:06 +0000)]
Merge "RevisionStore: Properly encode timestamp"
jenkins-bot [Sun, 18 Mar 2018 04:58:06 +0000 (04:58 +0000)]
Merge "Remove internal use of deprecated $wgRequestTime"
jenkins-bot [Sun, 18 Mar 2018 04:46:03 +0000 (04:46 +0000)]
Merge "Remove @group from ParserTestRunner"
Kevin Israel [Fri, 12 Aug 2016 10:33:37 +0000 (06:33 -0400)]
Remove internal use of deprecated $wgRequestTime
* Use $_SERVER['REQUEST_TIME_FLOAT'] unconditionally in WebRequest.php
and libs/Timing.php. WebStart.php was doing this already without issue.
The key existst since PHP 5.4, for both Web and CLI (we require 5.5).
* In wfDebug() and wfReportTime(), use $_SERVER['REQUEST_TIME_FLOAT'] instead.
* In ApiFormatBase and MWDebug, use WebRequest::getElapsedTime() instead.
* In Maintenance.php, remove setting of $wgRequestTime.
* In rebuildFileCache.php, update mocking to $_SERVER['REQUEST_TIME_FLOAT']
so that we avoid re-introducing bug T24852.
Change-Id: I1b647da2862f815029caa533b592ec8a05b33806
jenkins-bot [Sun, 18 Mar 2018 04:06:05 +0000 (04:06 +0000)]
Merge "Rename ApiTestCaseUpload"
jenkins-bot [Sun, 18 Mar 2018 03:58:51 +0000 (03:58 +0000)]
Merge "Make IPTest::isNotIPAddress a test function"
Brad Jorsch [Sun, 18 Mar 2018 02:02:13 +0000 (22:02 -0400)]
Fix WikiPageDbTestBase::testNewFromId_returnsNullOnNonExistingId
This test is passing an "integer" that is beyond what even 64-bit PHP
can properly represent as an integer, so it likely winds up passing it
as '7.
3574757437438E+19' to the database. MySQL, being MySQL, doesn't
care much, but other DBs do.
Change it to 2**31-1 instead.
Change-Id: Ieba51f034eaa1c3eabb2ada6b1ce876beefd3bff
Brad Jorsch [Sun, 18 Mar 2018 01:41:45 +0000 (21:41 -0400)]
RevisionStore: Properly encode timestamp
Timestamps in database queries need to be passed through
IDatabase::timestamp().
Change-Id: I1c163d80b2111a78bb10de49fe06d61f02c21d07
Aaron Schulz [Thu, 15 Feb 2018 03:46:04 +0000 (19:46 -0800)]
rdbms: make selectRowCount() use $var argument to exclude NULLs
If the $var argument is provided, then it will make the resulting
count exclude rows where the value for that column is NULL.
Also add buildSelectSubquery() method and Subquery
wrapper class for use with select() for calculated tables.
Change-Id: I549d629af99afdf370602de095f7fba6d1546c37
Max Semenik [Sat, 17 Mar 2018 07:42:25 +0000 (00:42 -0700)]
Uncomment and fix a test
Change-Id: I78524b01aac514f5fc54152ddeed59169b7e04fc
Max Semenik [Sat, 17 Mar 2018 05:30:19 +0000 (22:30 -0700)]
Normalize PHPDoc attributes
Change-Id: I83e686d099de0ff0aacda7e332972e1c7ee49f04
Max Semenik [Sat, 17 Mar 2018 00:26:17 +0000 (17:26 -0700)]
Don't use deprecated NS_IMAGE*
Change-Id: I3df00c8e55a79baa3f3727daeea6c9441113aebc
Timo Tijhof [Sat, 17 Mar 2018 02:51:26 +0000 (19:51 -0700)]
api: Restore fractions for default siprop=dbreplag response
Without this fix, the situation is that a query for 'siprop=dbreplag'
shows a db server with lag=0, while the siprop=dbreplag&sishowalldb=1
query shows the same server having non-zero lag. That's confusing.
Regression from r47865 (
88f35cdf6e).
Change-Id: Id4854c8453206a6f1f8c369dc89c3a8bd910f83f
jenkins-bot [Fri, 16 Mar 2018 23:09:41 +0000 (23:09 +0000)]
Merge "Remove #toc and #toctitle style definitions"
Derk-Jan Hartman [Tue, 20 Feb 2018 16:39:32 +0000 (17:39 +0100)]
Remove #toc and #toctitle style definitions
Styling by class is preferred over styling by id as a rule, and
this #toc .toc doubling up was in place since 2005.
(
28c9a747797dae738cd6fe1a97c29e1591564112)
13 years of cache protection seems adequate :)
Bug: T187808
Change-Id: I7f3a9df7f9fd1178986112b5265b1ae7c991d5b7
Max Semenik [Fri, 16 Mar 2018 21:33:45 +0000 (14:33 -0700)]
Pass revision being reverted to edit code
Otherwise, PageContentSaveComplete hook users are unable to detect
reverts.
Bug: T189819
Change-Id: Ib1dc0c323a9a5083b462421c68575fc22ad4af35
Aaron Schulz [Thu, 15 Mar 2018 21:29:29 +0000 (14:29 -0700)]
rdbms: small code cleanups to Database
Change-Id: I831b4ea1ced425b5008f3dd2802e16bb898f4b47
Subramanya Sastry [Thu, 1 Mar 2018 23:02:54 +0000 (17:02 -0600)]
RFC T157418: Trim whitespace in table cells, list items, headings
* Matmarex had implemented this for wikitext headings in
b3dd3881.
* This patch extends this to wikitext list items and wikitext table cells.
* Updated RELEASE NOTES.
tests/parser/parserTests.txt:
* All whitespace removed in output of list items, table cells, and
headings. Removed corresponding whitespace in the input wikitext
except for a few tests where the whitespace is significant "| +"
or "| -", for example.
* Updated output of html/parsoid sections as well.
* Added new tests to spec white-space trimming behavior.
tests/phpunit/*:
* Fixed a few tests that used whitespace in list items and table cells.
Bug: T157418
Change-Id: I8ea34c7ab893c0c125c81d810feeb3c581e4bba1
Umherirrender [Fri, 16 Mar 2018 17:40:38 +0000 (18:40 +0100)]
Rename ApiTestCaseUpload
Having *TestCase at end of the class name makes it easier to detect it
as TestCase class
Change-Id: Ic7ae7328e729c0f2d97afcf7c5be793d6a8df58f
Željko Filipin [Fri, 16 Mar 2018 15:55:06 +0000 (16:55 +0100)]
Selenium: configuration file for beta cluster
Bug: T185011
Change-Id: Icf8588f0e82acf09e6654dd5dbf33479e4ecbbb7
Umherirrender [Fri, 16 Mar 2018 16:54:14 +0000 (17:54 +0100)]
Make IPTest::isNotIPAddress a test function
Only functions starting with test* are running by phpunit
Change-Id: I91061fb3d5132c61e01e368fab0df0e511b1920d
Umherirrender [Fri, 16 Mar 2018 16:45:33 +0000 (17:45 +0100)]
Remove @group from ParserTestRunner
It should be used on phpunit tests only
Change-Id: I0f73690606c8b92ce65ed1324394f5523b8156f5
jenkins-bot [Fri, 16 Mar 2018 12:17:39 +0000 (12:17 +0000)]
Merge "Fix User::idFromName() ignoring cache for non-existent users."
Alexia E. Smith [Thu, 15 Mar 2018 15:24:21 +0000 (10:24 -0500)]
Fix User::idFromName() ignoring cache for non-existent users.
This fixes a database time out issue where User::idFromName()
is repeatedly called from Special:Import due to the user not existing.
The response is cached as null, but isset() will return false on a null key.
Bug: T189786
Change-Id: I78705089a25dfec84d3c75bedaf623b1e5ee82c4
jenkins-bot [Fri, 16 Mar 2018 11:21:56 +0000 (11:21 +0000)]
Merge "tests: fix Specified key was too long; in a schema"
Gergő Tisza [Fri, 16 Mar 2018 00:38:52 +0000 (17:38 -0700)]
Fix variable name in NewFilesPager::getQueryInfo
Bug: T189846
Change-Id: I11763ecbfd391deea0494386c0d7c1cb9861aa81
jenkins-bot [Thu, 15 Mar 2018 23:48:16 +0000 (23:48 +0000)]
Merge "Add cleanup for handlers cache."
Stanislav Malyshev [Thu, 15 Mar 2018 22:36:47 +0000 (15:36 -0700)]
Add cleanup for handlers cache.
This is useful if we want to override certain handler for testing
but have no way to remove it from cache otherwise.
Change-Id: Icb4f9360c6e7684d15e91a7009a5a3a3e2febb37
Antoine Musso [Thu, 15 Mar 2018 21:23:40 +0000 (22:23 +0100)]
tests: fix Specified key was too long; in a schema
MediaWikiTestCaseSchemaTest.sql comes with two varchar(255) combined
into a PRIMARY KEY.
That caused the testsuite to fail creating that imagelinks table with:
Error: 1071 Specified key was too long; max key length is 767 bytes
That is the limit for innodb and when using UTF8 it allows up to 3 bytes
per characters. Hence the key can be (255+255)*3 = 1530.
One can tune MySQL to bump the limit to ~ 3k with:
innodb_large_prefix = 1
Seems easier to just use smaller fields.
Change-Id: Ic4965b9eddc7ad9105c896e678ab9048ce0be8ef
Translation updater bot [Thu, 15 Mar 2018 21:03:48 +0000 (22:03 +0100)]
Localisation updates from https://translatewiki.net.
Change-Id: Ief5597ccece86f3f249cf7db7511be269572986c
Arlo Breault [Sat, 10 Mar 2018 00:40:36 +0000 (19:40 -0500)]
Clarify -{ => {{ transition
Ensure we have the correct rule on the stack.
Change-Id: Ie814df7b759a2381be0b815eeefdb5d1f7adcde0
jenkins-bot [Thu, 15 Mar 2018 16:07:28 +0000 (16:07 +0000)]
Merge "Fix field names and behavior in SlotRecord."
Volker E [Thu, 15 Mar 2018 04:19:34 +0000 (21:19 -0700)]
Remove `-webkit` vendor extension for browsers earlier than 2012
Removing `-webkit-gradient` value as it was just around for
Safari 4-5 and Chrome 2-9 both in released release range earlier
than 2012.
There's still the fallback color, which should be chosen wisely
anyways without cluttering our CSS output.
Change-Id: Iffb23fac44fc87cfb44f1056dfe1e4e1add444b4
Volker E [Thu, 15 Mar 2018 00:45:12 +0000 (17:45 -0700)]
Replace abandoned text color with WikimediaUI color palette one
Replacing leftover `#252525` with `#222` for code sanity.
Change-Id: I0406845950c65babe34672a6a59a390f56687e46
jenkins-bot [Thu, 15 Mar 2018 00:26:14 +0000 (00:26 +0000)]
Merge "resourceloader: Fix mw.loader to compute combined version in packed order"
jenkins-bot [Thu, 15 Mar 2018 00:16:19 +0000 (00:16 +0000)]
Merge "Convert MarkpatrolledAction to use OOUI"
jenkins-bot [Wed, 14 Mar 2018 23:13:41 +0000 (23:13 +0000)]
Merge "Revert "Let install.php detect and inject extensions""
jenkins-bot [Wed, 14 Mar 2018 22:33:58 +0000 (22:33 +0000)]
Merge "resourceloader: Make doRequest() an inline helper for batchRequest()"
Hashar [Wed, 14 Mar 2018 22:10:20 +0000 (22:10 +0000)]
Revert "Let install.php detect and inject extensions"
It is blatantly broken using non existing variables:
$installer and $options
This reverts commit
53926d9d6940eaa7f40086c9cf89af7bc726e73f.
Bug: T189567
Change-Id: Idd1f002bbd5d474f9fe386cd0e326e1fbfdec097
jenkins-bot [Wed, 14 Mar 2018 21:49:50 +0000 (21:49 +0000)]
Merge "resourceloader: Fix mw.loader to compute version for current request only"
Translation updater bot [Wed, 14 Mar 2018 20:55:25 +0000 (21:55 +0100)]
Localisation updates from https://translatewiki.net.
Change-Id: Id3b91ddc41a35c360ca3acb8fc2cf1c35321c967
jenkins-bot [Wed, 14 Mar 2018 20:46:58 +0000 (20:46 +0000)]
Merge "resourceloader: Fix broken code in load.php mock used to make a test fail"
jenkins-bot [Wed, 14 Mar 2018 20:12:40 +0000 (20:12 +0000)]
Merge "resourceloader: Simplify load.mock.php by removing includes dependency"
jenkins-bot [Wed, 14 Mar 2018 16:17:41 +0000 (16:17 +0000)]
Merge "WikiTextStructure: Exclude <style> tags"
jenkins-bot [Wed, 14 Mar 2018 14:09:01 +0000 (14:09 +0000)]
Merge "Correct PHP version in maintenance/dev/README"
jenkins-bot [Wed, 14 Mar 2018 10:18:08 +0000 (10:18 +0000)]
Merge "Fix typo accessable --> accessible"
jenkins-bot [Wed, 14 Mar 2018 09:57:18 +0000 (09:57 +0000)]
Merge "rdbms: allow construction of Database objects without connecting"
jenkins-bot [Wed, 14 Mar 2018 08:52:39 +0000 (08:52 +0000)]
Merge "Let install.php detect and inject extensions"
jenkins-bot [Wed, 14 Mar 2018 08:37:27 +0000 (08:37 +0000)]
Merge "Add Russian grammar forms to support Wikiversity"
Jayprakash12345 [Wed, 14 Mar 2018 05:24:09 +0000 (05:24 +0000)]
Fix typo accessable --> accessible
Change-Id: I239a15e1bc3a311d9284285a04094afae331111d
jenkins-bot [Wed, 14 Mar 2018 02:06:55 +0000 (02:06 +0000)]
Merge "rdbms: Add $join_conds to IDatabase::estimateRowCount()"
jenkins-bot [Wed, 14 Mar 2018 01:57:50 +0000 (01:57 +0000)]
Merge "rdbms: inject the mysql index name aliases into Database"
jenkins-bot [Wed, 14 Mar 2018 01:48:32 +0000 (01:48 +0000)]
Merge "resourceloader: Clean up and better document module list (un)packing"
Aaron Schulz [Thu, 8 Mar 2018 21:38:10 +0000 (13:38 -0800)]
rdbms: avoid throwing exceptions in Database::close() on reconnect
The check caused problems in reconnect() calls from rollback()
triggered by LBFactory::rollbackMasterChanges(). Since callbacks
are suppressed at that time, handleSessionLoss() does not consume
all of them, so the the call to open() triggered a close() call
that would error out since the callbacks are still there.
Only do that check if a connection was present beforehand.
Check for callback suppression before trying commit() too.
Also make writesOrCallbacksPending() check trxEndCallbacks.
Bug: T188875
Change-Id: Ia46d30d75132358a0b4f60e847937013781c1daa