Siebrand Mazeland [Wed, 31 Oct 2012 20:48:24 +0000 (21:48 +0100)]
Localisation updates from translatewiki.net.
Updates for magic words.
Change-Id: Ib1ee9f9b3b1fcac2f2c80b131f2dc122be43d532
Siebrand Mazeland [Wed, 31 Oct 2012 19:41:40 +0000 (20:41 +0100)]
Localisation updates from translatewiki.net.
Updates for special pages aliases.
Change-Id: I18d500477d1de6df2b85b377c37076b9ac721557
daniel [Wed, 31 Oct 2012 19:16:36 +0000 (20:16 +0100)]
Fix handling of prot-rel URLs in SiteObject.
Previously, getProtocol() would return null for a protocol relative URL,
but the database field sites_protocol does not allow null as a value.
Changed getProtocol() to return an empty string instead.
Change-Id: I7e22cc3c3d8dca17a28fc4627083d5d2cb253887
Nikerabbit [Wed, 31 Oct 2012 07:27:01 +0000 (07:27 +0000)]
Merge "WikitextContentHandlerTest expects the messages to be in English."
Nikerabbit [Wed, 31 Oct 2012 06:56:22 +0000 (06:56 +0000)]
Merge "Proper directionality for entry points table"
Aaron Schulz [Tue, 30 Oct 2012 02:04:03 +0000 (19:04 -0700)]
[FileRepo] Changed "publishBatch" to handle failure better.
* Instead of moving the current file to the archive name,
and then storing the new one, copy the current file to the
archive name and overwrite the new one. When and object store
backend is used, this reduces the number of operations from
COPY, DELETE, PUT to just COPY and PUT. This reduces the RTTs,
chances for failures, and avoids the period of time where the
file has no current version.
* Also removed the "force" option to make file changes more likely
to be all or nothing.
Change-Id: I46fc5c5c1fda5b386958b57557942f500de9dc2c
Aaron Schulz [Mon, 29 Oct 2012 19:57:04 +0000 (12:57 -0700)]
[FileBackend] Support "ignoreMissingSource" for copy and move operations.
* This lets callers use "copy if exist" semantics more easily and avoids extra stat
queries to the backend (since the cache is cleared before doOperations()).
* Tweaked FileOp::fileSha1() to reduce backend stat requests as 404s are not cached.
Change-Id: Icb5ca14b3316f273d53593f48979d14e113990e1
Aaron Schulz [Wed, 31 Oct 2012 00:32:50 +0000 (17:32 -0700)]
[JobQueue] Make use of the isEmpty() function caching in pop().
Change-Id: I92f538f4eb1e912f3446423a0ca51d9a63bf4457
Platonides [Tue, 30 Oct 2012 22:48:17 +0000 (23:48 +0100)]
WikitextContentHandlerTest expects the messages to be in English.
The 4 testGetAutosummary were failing with the wiki configured
to a different language.
Change-Id: Ibb003a8d5758b25032e0e7df98dfc90d149409db
Demon [Tue, 30 Oct 2012 20:50:54 +0000 (20:50 +0000)]
Merge "[FileBackend] Made path normalization in FileOp more robust."
Translation updater bot [Tue, 30 Oct 2012 20:21:22 +0000 (20:21 +0000)]
Localisation updates from translatewiki.net.
Change-Id: I0bf66cb49b3111d95c4ae3a0d56935fe03065345
parent5446 [Mon, 29 Oct 2012 20:07:49 +0000 (16:07 -0400)]
(bug 37963) Fixed loading process for user options.
The bug has actually already been fixed, so this
patch just removes extraneous function calls and code in
User::getOption() and User::setOption(). It also adds
unit tests for user options (including a test for the
case provided in the bug report).
Change-Id: Idd8af9cf1a26a4adbde3ca71dde64539ecd0a207
Demon [Tue, 30 Oct 2012 18:30:24 +0000 (18:30 +0000)]
Merge "[FileBackend] Use the new CloudFiles metadata functions."
IAlex [Tue, 30 Oct 2012 18:29:31 +0000 (18:29 +0000)]
Merge "(bug 41494) Honor $wgLogExceptionBacktrace in APIMain"
umherirrender [Sat, 13 Oct 2012 18:01:38 +0000 (20:01 +0200)]
(bug 40574) hints for generatexml param in api modules
Change-Id: I782d64eed5faac6836a57463e195e64c4314199c
Aaron Schulz [Mon, 22 Oct 2012 18:58:08 +0000 (11:58 -0700)]
[FileBackend] Use the new CloudFiles metadata functions.
* This helps proof against annoying case sensitivity and case mangling issues.
Change-Id: I580f609847260ee8c5bd99926a615f88bb7395d6
Aaron Schulz [Tue, 30 Oct 2012 09:11:53 +0000 (02:11 -0700)]
[FileBackend] Made path normalization in FileOp more robust.
* This normalizes all the storage paths on object construction.
Change-Id: Ie50fc47a66e441992ea0b9659854d9f38c05925c
Aaron Schulz [Mon, 29 Oct 2012 23:56:43 +0000 (16:56 -0700)]
[FileBackend] Simplified code for handling "overwrite" parameter.
* Since doQuickOperations() implicitely sets "overwrite", and doOperations() handles it
via FileOp, there is no reason to also have each backend double checking this parameter
to handle it. The parameter is no implicit for all the *Internal() functions. This does
not affect callers. It does reduce the amount of HEAD requests since 404s are not cached.
Change-Id: I7d827e16bc55fe5c7b9aa51ec0c6b2f7c0bb629e
Brion VIBBER [Mon, 29 Oct 2012 23:02:56 +0000 (23:02 +0000)]
Merge "Don't fail on incomplete row info when exporting."
Aaron Schulz [Fri, 26 Oct 2012 23:15:27 +0000 (16:15 -0700)]
[FileBackend] Simplified FileOpBatch code to have just one "run" function.
Change-Id: Iae6c8e96e2558588f76f23c1ceb160a6fc372aa8
daniel [Mon, 29 Oct 2012 21:47:19 +0000 (22:47 +0100)]
Don't fail on incomplete row info when exporting.
This allows XmlDumpWriter to output rows that are missing some
information without triggering php warnings.
This fixes warnings caused by the OAI extension when using
XmlDumpWriter::writeRevision without setting the row's
rev_parent_id field.
Generally, it seems convenient to allow optional fields to be unset
instead of skipping them if they are empty, but requiering them to be
set.
Change-Id: I246ba3a899bd9e833232444a11ac63e1b0225ab6
Translation updater bot [Mon, 29 Oct 2012 21:44:55 +0000 (21:44 +0000)]
Localisation updates from translatewiki.net.
Change-Id: Ia34403425fd68e236a676f49faba0447df2bc0c5
Amir E. Aharoni [Mon, 29 Oct 2012 13:30:47 +0000 (15:30 +0200)]
Proper directionality for entry points table
The entry points table inherited the interface language's
dir and lang values. This caused weird display in RTL languages
and possible problems with webfonts, which work with the lang attribute.
This commit sets explicit lang="en" dir="ltr" for the whole entry points
table and explicit lang and dir of the current interface language for
the table headings.
Change-Id: I396ec98b4ea14d06bf91002b6bc4a293c09fdb33
Brad Jorsch [Mon, 29 Oct 2012 20:52:44 +0000 (16:52 -0400)]
(bug 41494) Honor $wgLogExceptionBacktrace in APIMain
When the API catches a non-API exception, it logs the message but does
not record the backtrace. It should honor $wgLogExceptionBacktrace
(added in 1.20) to decide whether to log the backtrace or just the
message.
Change-Id: I33fcbebd0e41dc2fda0cd00f8779e013300c0494
Siebrand [Mon, 29 Oct 2012 20:11:41 +0000 (20:11 +0000)]
Revert "Deglobalization in EditPage.php"
Reverts I2c600915. Regular UI edits seem to go through fine, but things go
horribly wrong for reasons unknown to me in for example LiquidThreads.
That's of course not acceptable, so reverting. Also see bug 41497.
Change-Id: Id95e279c0ec0fbcc162983a12434282f55e8489e
Catrope [Mon, 29 Oct 2012 20:03:16 +0000 (20:03 +0000)]
Merge "(bug 41042) Regression: API action=parse with nonexistent page"
Catrope [Mon, 29 Oct 2012 19:44:18 +0000 (19:44 +0000)]
Merge "list=allusers&aurights=[unusedright] returns all users of the wiki"
daniel [Mon, 29 Oct 2012 18:51:50 +0000 (19:51 +0100)]
(Bug 41436) Tone down sanity check, just warn, don't die.
This is a follow-up to I9db228c3 fixing an issue with undelete:
Page ID 47009 mismatches the ID 47010 provided by the Title object.
Backtrace:
0 /var/www/CephWiki/core/includes/Revision.php(188): Revision->__construct(Array)
1 /var/www/CephWiki/core/includes/specials/SpecialUndelete.php(548): Revision::newFromArchiveRow(Object(stdClass), Array)
2 /var/www/CephWiki/core/includes/specials/SpecialUndelete.php(381): PageArchive->undeleteRevisions(Array, false, '')
3 /var/www/CephWiki/core/includes/specials/SpecialUndelete.php(1510): PageArchive->undelete(Array, '', Array, false, Object(User))
4 /var/www/CephWiki/core/includes/specials/SpecialUndelete.php(778): SpecialUndelete->undelete()
5 /var/www/CephWiki/core/includes/SpecialPage.php(599): SpecialUndelete->execute(NULL)
Change-Id: I0517c5826bcba2a85fee596b0473a16da26c3b2f
Aaron Schulz [Mon, 29 Oct 2012 18:09:43 +0000 (11:09 -0700)]
[FileRepo] Fixed purging for "short style" thumbnail names.
Change-Id: If63b4c609b7bc43cda658cb87abe59562b335c69
Brad Jorsch [Tue, 16 Oct 2012 15:42:54 +0000 (11:42 -0400)]
(bug 41042) Regression: API action=parse with nonexistent page
Changeset Iec98e472 changed the behavior of action=parse&page=... when
passed a page that does not exist: previously, it would return a
"missingtitle" error instead of assuming an empty page. As some people
had been depending on this old behavior, restore the error checking.
Change-Id: I4c76ce458ceb01e233c6074cd9251879013ec143
IAlex [Mon, 29 Oct 2012 17:11:17 +0000 (17:11 +0000)]
Merge "OutputPage::addWikiTextTitleTidy() requires variable as second para"
Reedy [Mon, 29 Oct 2012 16:45:30 +0000 (16:45 +0000)]
Merge "(Big 41436) Make sure Revision knows page Title."
Siebrand Mazeland [Mon, 29 Oct 2012 16:26:13 +0000 (17:26 +0100)]
OutputPage::addWikiTextTitleTidy() requires variable as second para
Was trowing PHP Strict Standards: Only variables should be passed by
reference.
Change-Id: I97ede1c61636c9758408b66b84694c2a5825a259
Siebrand Mazeland [Mon, 29 Oct 2012 16:03:27 +0000 (17:03 +0100)]
Fix typo in method
Change-Id: I023a5417e62a56125b9e59197ac33f6f48094e2b
Hashar [Mon, 29 Oct 2012 15:46:22 +0000 (15:46 +0000)]
Merge "Update some external conversion tables to latest versions"
Reedy [Mon, 29 Oct 2012 15:43:21 +0000 (15:43 +0000)]
Merge "Deglobalization in EditPage.php"
daniel [Mon, 29 Oct 2012 15:21:27 +0000 (16:21 +0100)]
(Big 41436) Make sure Revision knows page Title.
With $wgContentHandlerUseDB, Revision needs access to the page's Title
object to determin the page's default content model. This apparently
failed in production for newly created pages (supposedly because of
some complication with database transactions or master/client setup).
This change makes WikiPage::doEditContent pass the Title object
directly to the Revision to avoid any database issues. This also
gets rid of a pointless database read.
Change-Id: I9db228c3fcda0f8dfe52be1659014a6e4b4775af
daniel [Fri, 26 Oct 2012 10:43:02 +0000 (12:43 +0200)]
Warn when creating TextContent around false/null.
Instantiating a TextContent instance around a null or false value
instead of a string may indicate an error and should thus trigger
a warning and thereby make tests fail.
Change-Id: I0864bbf31040d0c5db96a90ff427dc9dd3ccbd67
Reedy [Mon, 22 Oct 2012 22:51:26 +0000 (23:51 +0100)]
Back out config table and related code
Change-Id: I4fa180d45984a4ec2b2c7b1149015c6dad14c5f0
Demon [Mon, 29 Oct 2012 14:21:42 +0000 (14:21 +0000)]
Merge "Cache the result of User::getDefaultOptions"
Alex Monk [Mon, 29 Oct 2012 03:12:31 +0000 (03:12 +0000)]
Symlink README.mediawiki to README so Github renders it as wikitext.
The README file is displayed at https://github.com/mediawiki/core but is not parsed as wikitext.
This change should fix that.
Unfortunately this doesn't work for viewing other files, where it just shows the name of the destination of the symlink.
Change-Id: I56b29da20a0ea45d3cb4ad6cc98091406886cb79
Nikerabbit [Mon, 29 Oct 2012 12:15:37 +0000 (12:15 +0000)]
Merge "Stash global only once per test case."
robin [Thu, 25 Oct 2012 23:07:42 +0000 (01:07 +0200)]
Add the page content language to the page information
Change-Id: Id2aa19c66b299e3462cf3bea4020827f9f2ee1ef
Siebrand [Mon, 29 Oct 2012 10:32:06 +0000 (10:32 +0000)]
Merge "(bug 32237) Add GENDER support to Special:EmailUser"
Siebrand Mazeland [Mon, 8 Oct 2012 11:56:48 +0000 (13:56 +0200)]
Deglobalization in EditPage.php
Some details:
* Using context as much as possible.
* Changed mTitle/mArticle to getTitle()/getArticle().
* Tweaked some comments.
* Broke some long lines.
Change-Id: I2c600915d8a4af98215de9bf9d2d60abdc675fab
Siebrand [Mon, 29 Oct 2012 10:18:10 +0000 (10:18 +0000)]
Merge "tests: rm duplicate code in language classes"
Amir E. Aharoni [Sun, 28 Oct 2012 20:19:23 +0000 (22:19 +0200)]
(bug 32237) Add GENDER support to Special:EmailUser
Change-Id: Ie72cc90518c6f5880632fe17d4c60f392e3ddec6
daniel [Thu, 25 Oct 2012 15:29:10 +0000 (17:29 +0200)]
Stash global only once per test case.
Make sure we only stash a given global only once per test case since we
do not want to override the original value.
This allows the same test to modify the same global multiple times,
while still preserving the original value to be restored after the
test case finished.
Change-Id: I9056d6d6879fb976a192960f661904287f9760a8
Nikerabbit [Mon, 29 Oct 2012 08:58:36 +0000 (08:58 +0000)]
Merge "(bug 31565) Option to use group members on Special:UserRights"
Antoine Musso [Tue, 23 Oct 2012 20:53:17 +0000 (22:53 +0200)]
tests: rm duplicate code in language classes
The language classes have been using the same setUp() tearDown() to
craft a new language object. I have abstracted that code in
LanguageClassesTestCase and made all the language test classes to extend
it. The language is interpolated directly from the class name and an
object for it can be retrieved with the getLang() method.
Change-Id: Ib931336ce219edabe2c72b7e9f04c976a500723e
Daniel Friesen [Fri, 19 Oct 2012 08:12:56 +0000 (01:12 -0700)]
Preemptively add image-set to our sanitizer.
WebKit's -webkit-image-set() requires a url() to work however css4-images'
version of image-set permits strings such that image-set( 'asdf.png' 1x ) would be permitted
and would bypass our filters.
Change-Id: I366d04807f66df449f791a5e8e2cb58768124a9a
Amir E. Aharoni [Wed, 24 Oct 2012 10:24:37 +0000 (12:24 +0200)]
(bug 31565) Option to use group members on Special:UserRights
If a language community wants to show member names rather than
group names, it's possible to use the new optional message
userrights-groupsmember-type.
Change-Id: I1dc3efcb2c8a32a01b33158c9a14c079e42705d7
Marius Hoch [Mon, 29 Oct 2012 00:21:20 +0000 (01:21 +0100)]
Cache the result of User::getDefaultOptions
Caching the result of User::getDefaultOptions as it always returns
the same data, despite for unit tests, which can't use the cached
values as they do evil things with variables being constant in normal
operation.
Change-Id: I02d557006d2f879e7ce510a5e47fa1543baab8a6
Marius Hoch [Tue, 23 Oct 2012 00:21:47 +0000 (02:21 +0200)]
(bug 40641) Implement Special:Version/Credits
I've implemented Special:Version/Credits to have a nice list of contributors,
without having to download a file. The page takes it's data from the
CREDITS file and parses it as wiki text.
(As I was on it, I was so bold to add my name to the CREDITS)
Change-Id: Ic956c303d57fdccfd214c2fcb78d04c6bd30449a
Siebrand [Sun, 28 Oct 2012 22:30:53 +0000 (22:30 +0000)]
Merge "revert gerrit change 29597 for TextContent constructor"
Translation updater bot [Sun, 28 Oct 2012 21:04:20 +0000 (21:04 +0000)]
Localisation updates from translatewiki.net.
Change-Id: Ie33d83a4d96477c2ed53bba8ee01bc760b980351
IAlex [Sun, 28 Oct 2012 20:25:15 +0000 (20:25 +0000)]
Merge "(bug 41443) Link in password reset is broken"
Marius Hoch [Sat, 27 Oct 2012 00:10:02 +0000 (02:10 +0200)]
(bug 41443) Link in password reset is broken
The link in the password reset email was broken, because the
paramters for passwordreset-emailtext-user were over-escaped.
I've fixed this with passing the message unescaped, per suggestion.
Change-Id: If2665a419f5ee11602d4a69b60f7c4786f816ee2
umherirrender [Fri, 5 Oct 2012 19:03:17 +0000 (21:03 +0200)]
list=allusers&aurights=[unusedright] returns all users of the wiki
Filter for an unused right gives an empty group array, which
is not added to the query and than all users (with limit) are
selected.
Change-Id: I57c3c4d2b49653d71391b0d7755fdc0ad1d3a7d0
IAlex [Sun, 28 Oct 2012 19:19:00 +0000 (19:19 +0000)]
Merge "(bug 41457) PHP Fatal error: Cannot break/continue 2 levels in maintenance/runJobs.php on line 94"
Translation updater bot [Sat, 27 Oct 2012 21:09:42 +0000 (21:09 +0000)]
Localisation updates from translatewiki.net.
Change-Id: Idec43da0b0f04b1579d3f250a81315377d69d337
Reedy [Sat, 27 Oct 2012 20:34:34 +0000 (21:34 +0100)]
(bug 41457) PHP Fatal error: Cannot break/continue 2 levels in maintenance/runJobs.php on line 94
Change-Id: Ic53227596a0acdc92bc9925a260b7f029e67da03
Niklas Laxström [Sat, 27 Oct 2012 17:34:39 +0000 (17:34 +0000)]
Fix unmatched profiling calls
Change-Id: Iccddc819712b4f3c00e826a21fa131ed1298bb35
TheDJ [Sat, 27 Oct 2012 12:51:08 +0000 (12:51 +0000)]
Merge "(bug 1) document Skin::buildSidebar per own experience"
Siebrand [Sat, 27 Oct 2012 10:52:26 +0000 (10:52 +0000)]
Merge "A little cleanup in gender"
Siebrand [Sat, 27 Oct 2012 10:31:43 +0000 (10:31 +0000)]
Merge "(bug 41439) Set be as fallback language for be-tarask."
IAlex [Sat, 27 Oct 2012 06:17:28 +0000 (06:17 +0000)]
Merge "rm unused $egWBRemoteTitleNormalization var from MediaWikiSite.php"
IAlex [Sat, 27 Oct 2012 06:10:18 +0000 (06:10 +0000)]
Merge "The class is named Revision, no need to shout its name :) Remove a couple of unused globals."
aude [Fri, 26 Oct 2012 22:07:50 +0000 (22:07 +0000)]
rm unused $egWBRemoteTitleNormalization var from MediaWikiSite.php
Change-Id: I8151b79f97ac7fea547a974ad64d404ff881a2e2
Amir E. Aharoni [Fri, 26 Oct 2012 21:26:12 +0000 (23:26 +0200)]
A little cleanup in gender
Documentation and whitespace.
Change-Id: Ia28ab9eee8d1fb6301532d820f7f8cfd2f8a5146
Aaron Schulz [Fri, 26 Oct 2012 22:01:01 +0000 (15:01 -0700)]
Avoid duplicate "null" change journal entries.
Change-Id: Ie5625963d4755b7aa7b3ecf3aaca0eb9e9e22cf5
Platonides [Fri, 26 Oct 2012 21:41:24 +0000 (23:41 +0200)]
The class is named Revision, no need to shout its name :)
Remove a couple of unused globals.
Change-Id: I750536bc05ed7a5433840b916b17df93d30da5bf
Platonides [Wed, 24 Oct 2012 15:35:30 +0000 (17:35 +0200)]
(bug 41439) Set be as fallback language for be-tarask.
Per the thread at
http://lists.wikimedia.org/pipermail/wikilovesmonuments/2012-October/005194.html
Change-Id: I2f4da7a478eae8996a1f77c819864d3e9457cf07
MatmaRex [Mon, 22 Oct 2012 18:59:44 +0000 (20:59 +0200)]
(bug 1) document Skin::buildSidebar per own experience
Lessons learned from CologneBlue rewrite and bug 40857.
Change-Id: If56df0a7ce20bc8f7a73252d06baf97264793069
Catrope [Fri, 26 Oct 2012 21:10:24 +0000 (21:10 +0000)]
Merge "fix sidebar HTML escaping in CologneBlue (again)"
MatmaRex [Fri, 26 Oct 2012 21:04:01 +0000 (23:04 +0200)]
fix sidebar HTML escaping in CologneBlue (again)
Followup to I6df92c62.
Change-Id: If9394a6223da987dc363057e276c7f754acc06a8
Aaron Schulz [Fri, 26 Oct 2012 21:02:32 +0000 (14:02 -0700)]
Minor documentation fix.
Change-Id: I4efc89b4b4149caba62663a7b56f0f57eb9c6b52
Ori.livneh [Fri, 26 Oct 2012 20:49:36 +0000 (20:49 +0000)]
Merge "fix sidebar HTML escaping in CologneBlue"
Niklas Laxström [Wed, 24 Oct 2012 14:59:37 +0000 (14:59 +0000)]
Rewritten $wgAdaptiveMessageCache
This was developed for translatewiki.net, which has but
millions of messages in MediaWiki namespace. To avoid
exploding the message cache, not all of them can be
loaded. Instead of logging what messages have been
requested, now it uses the fact that if the
message has not been customised in the
site language, there is most likely
no reason to load it in any other
language either.
Change-Id: I6dd81b3858acfd2b73332e46668d46015e99c748
Translation updater bot [Fri, 26 Oct 2012 19:36:23 +0000 (19:36 +0000)]
Localisation updates from translatewiki.net.
Change-Id: Icb7d8fbc1c2bcca4c53b776b2abeb0e4928380cf
Nikerabbit [Fri, 26 Oct 2012 18:57:25 +0000 (18:57 +0000)]
Merge "Fix tabs inside/between statements/text"
Nikerabbit [Fri, 26 Oct 2012 18:35:25 +0000 (18:35 +0000)]
Merge "Fix rc_logid in RecentChange::loadFromCurRow"
MaxSem [Fri, 26 Oct 2012 16:41:04 +0000 (16:41 +0000)]
Merge "Move cache purging out of doUpdates()"
umherirrender [Fri, 26 Oct 2012 16:18:59 +0000 (18:18 +0200)]
Fix tabs inside/between statements/text
This tabs are strange and a space there is better
Change-Id: I0885dff575ee2fcd0668d08fef3226e132c5b319
umherirrender [Fri, 26 Oct 2012 15:42:13 +0000 (17:42 +0200)]
Fix indentation whitespace errors
Change-Id: Ie268bee2098c589c050e1b5b0e93fe1b3feca86f
umherirrender [Fri, 26 Oct 2012 15:22:14 +0000 (17:22 +0200)]
Fix rc_logid in RecentChange::loadFromCurRow
Blame r32046
Change-Id: Id50dfe0704d3bb6dd8ecac9ff0395761813d53e7
aude [Fri, 26 Oct 2012 04:10:19 +0000 (04:10 +0000)]
(bug 41298) re-apply I9a56b7c6, Don't parse the section's name in the summary
Change-Id: I11492200ed8cd199dbbde737a28e8acb07403096
Antoine Musso [Fri, 26 Oct 2012 11:02:48 +0000 (13:02 +0200)]
raise timeout for UserTest::testEditCount
UserTest::testEditCount did eleven calls to doEdit which is slow when
used with the sqlite backend. I have made to do less edits and also
marked it as '@group medium' which means the timeout will be 10 seconds
instead of 2 seconds.
Change-Id: If2d055075470f837009568d56b1119a57b177ba3
Daniel Kinzler [Fri, 26 Oct 2012 08:05:48 +0000 (08:05 +0000)]
Merge "(bug 41409) Fix regression in diffs while editing old revisions"
Aaron Schulz [Fri, 26 Oct 2012 04:15:49 +0000 (21:15 -0700)]
[FileBackend] More improvements to README file.
Change-Id: Ie2a7a457b2cdf6090f6f48824b3dd131d661880a
Brad Jorsch [Fri, 26 Oct 2012 02:09:50 +0000 (22:09 -0400)]
(bug 41409) Fix regression in diffs while editing old revisions
Until the ContentHandler merge, when editing an old revision the "Show
changes" button would show the diff between the current version and the
text in the edit field. It appears that the ContentHandler merge somehow
unfixed bug 34849.
The same fix that was applied for that bug in r112819 translated into
ContentHandler terms seems to fix the bug again here.
Change-Id: I1eee25c530ef87ff2ecd61f0fd5c01de94eccb98
Tychay [Thu, 25 Oct 2012 22:36:32 +0000 (22:36 +0000)]
Merge "Revert "Function for "pretty timestamps" that are human readable and understandable.""
Aaron Schulz [Thu, 25 Oct 2012 21:23:10 +0000 (21:23 +0000)]
Merge "Seems we have error conditions where fa_storage_key == ''"
Brion VIBBER [Thu, 25 Oct 2012 21:07:07 +0000 (21:07 +0000)]
Merge "[JobQueue] Added support for approximate FIFO job queues."
Timo Tijhof [Sat, 20 Oct 2012 01:51:15 +0000 (03:51 +0200)]
Fix warnings and enforce conventions in ContentHandler tests.
Syntax:
* Call parent setUp from setUp.
* Set required globals for the test inside the test class instead
of assuming the default settings.
* Data providers are called statically and outside setUp/tearDown
("public static function")
* Test function names should be prefixed with "test"
("testIsRedirect")
* Marked 2 functions as unused. JavascriptContentTest has 2 data
providers for tests that don't exist in it (nor in TextContentText)
but do exist in WikitextContentTest.
Style:
* Single quotes
* Remove odd comment "# =====" lines
* Consistent tree wrapping with arrays.
array(
array(
.. ) );
array(
array(
..
)
);
Some were closing on the previous line instead.
Made it consistent now.
* Remove odd indentation to make nested arrays line up:
array( 'foo' => array( 'bar' => true,
'baz' => array() ) )
array( 'foo' => array(
'bar' => true,
'baz' => array()
) )
We don't do this kind of indentation because it is fragile
and becomes outdates when any of the earlier keys ("foo")
change. Converted to a regular tree instead.
Also triggered git warnings for mixing spaces with tabs, which
is almost always an detector for this style.
* Not using @annotations in inline comments, reserved (and only
parsed/meaningful) for block comments.
Follows-up
8b568be5e2dfb889e1eeedbdca50b304864174f7
Change-Id: Ic55d539b9a58f448b550bcd98894d389764e0694
Translation updater bot [Thu, 25 Oct 2012 20:05:44 +0000 (20:05 +0000)]
Merge "Localisation updates from translatewiki.net."
Nikerabbit [Thu, 25 Oct 2012 20:02:42 +0000 (20:02 +0000)]
Merge "(bug 38377) Fix MediaWiki:Continue-editing"
Translation updater bot [Thu, 25 Oct 2012 19:52:59 +0000 (19:52 +0000)]
Localisation updates from translatewiki.net.
Change-Id: I015596c76b853ed572b9f4457fffd23970670b21
Aaron Schulz [Thu, 25 Oct 2012 19:14:28 +0000 (19:14 +0000)]
Merge "(Bug 41370) protect aginst content-less revisions"
Aaron Schulz [Thu, 25 Oct 2012 18:25:58 +0000 (18:25 +0000)]
Merge "Add additional job columns to PostgreSQL as well."