lhc/web/wiklou.git
11 years agoShow revdel links instead of checkboxes on pages where there is no multiple log entry...
Alex Monk [Tue, 15 May 2012 00:45:05 +0000 (01:45 +0100)]
Show revdel links instead of checkboxes on pages where there is no multiple log entry revdel form.

Change-Id: Ie061ee5b77a39c13628bfdb73f09cb3fa97dd090

11 years agoMerge "Factor out module name validation into a static function"
Aaron Schulz [Wed, 9 May 2012 23:41:44 +0000 (23:41 +0000)]
Merge "Factor out module name validation into a static function"

11 years agoMerge "Remove 'jquery.ui.button' as dependency for mediawiki.action.history"
Catrope [Wed, 9 May 2012 22:43:45 +0000 (22:43 +0000)]
Merge "Remove 'jquery.ui.button' as dependency for mediawiki.action.history"

11 years agoFactor out module name validation into a static function
Catrope [Wed, 9 May 2012 21:10:33 +0000 (14:10 -0700)]
Factor out module name validation into a static function

Also add the requirement that module names be at most 255 bytes, so
they'll fit in the DB fields that we put module names in (md_module,
mr_resource, mrl_resource)

Change-Id: I7193c9beb7aff4eabfe20db461e6f9032ae994b1

11 years ago[SiteStatsUpdate] Changing raw DB update calls to use SiteStatsUpdate.
Aaron [Wed, 9 May 2012 20:59:27 +0000 (13:59 -0700)]
[SiteStatsUpdate] Changing raw DB update calls to use SiteStatsUpdate.

* Made SiteStatsUpdate fields protected
* Added factory function for unretarded object construction
* Changed FileRepo code to use deferred stats updates like everything else

Change-Id: I93039104b14f0362509e37b6852604ffb0898dc7

11 years agoLocalisation updates from http://translatewiki.net.
Translation updater bot [Wed, 9 May 2012 20:10:15 +0000 (20:10 +0000)]
Localisation updates from translatewiki.net.

Change-Id: I5c0b31d07219bbc804862ff53c877e82d803b789

11 years agoMerge "Use local context to get messages"
Aaron Schulz [Wed, 9 May 2012 18:44:11 +0000 (18:44 +0000)]
Merge "Use local context to get messages"

11 years agoMerge "[FileRepo] Purging/transaction fixes."
Brion VIBBER [Wed, 9 May 2012 18:37:23 +0000 (18:37 +0000)]
Merge "[FileRepo] Purging/transaction fixes."

11 years agoUse local context to get messages
Alexandre Emsenhuber [Mon, 7 May 2012 04:38:51 +0000 (06:38 +0200)]
Use local context to get messages

Change-Id: Ieb3564e5532e421b4b803ed6c327d6a75ed0103c

11 years agoAdded missing GPLv2 headers in some places.
Alexandre Emsenhuber [Wed, 9 May 2012 17:55:56 +0000 (19:55 +0200)]
Added missing GPLv2 headers in some places.

Also made file/class documentation more consistent.

Change-Id: Ib46e50da4ec649a6a06cbeed00752effb79ed06e

11 years agoMerge "Add CSS class .mw-code (matching <pre>)"
Timo Tijhof [Wed, 9 May 2012 14:40:34 +0000 (14:40 +0000)]
Merge "Add CSS class .mw-code (matching <pre>)"

11 years agoAdd CSS class .mw-code (matching <pre>)
Timo Tijhof [Sat, 14 Apr 2012 03:23:16 +0000 (05:23 +0200)]
Add CSS class .mw-code (matching <pre>)

- Add CSS class .mw-code.
  All skins that stye <pre> now also style .mw-code.
  This is because there are situations where a <pre> element is not
  allowed (e.g. when the child code contains <div>) by Tidy and W3C, but
  should still be styled as such.

- Required for fixing bug 19416 and bug 35875.
  SyntaxHighlighter Geshi has it's own custom markup that can't be relied on
  for both consistency (it can change over time) and due to its own
  over "!important"-ized css reset on it's own classes, so although it
  (sometimes!) does use a <pre>, that <pre> is completely reset so the skins
  css doesn't (and frankly shouldn't) apply to that.

  Up until last year this extension wrapped all of Geshi's internal output in
  a <div class="mw-geshi" />. Leaving all wmf wikis to have to create a hack
  in their local css (for every skins!) to reproduce the skins's <pre> style
  on .mw-geshi.

  Previously this was attempted to be fixed inside Geshi itself by wrapping
  all of Geshi's internal output in a <PRE class="mw-geshi"> instead of a
  <DIV class="mw-geshi">. That worked fine because that element didn't have
  any of geshi's internal classes on it so it was outside the scope of the
  reset and the skins' css applied fine.

  However when Tidy is enabled this got messed up badly and (part) of the
  Geshi output was ripped out of the containing <pre> by Tidy because the W3C
  doesn't allow a <div> to be inside a <pre>.

  Now fixed in a different way by instead providing a css class in all skins
  that when given to any element will give it the same styling that it does
  to <pre>. Separation of content and styling.

  Tested in all core skins, works great. The style of the geshi output is
  preserved and the container looks like any other <pre> in that skin.

Change-Id: I4ff5d0197ba8dc0dad3cafd03f2b120bc22e75cb

11 years agoMerge "Follow up change Icc8dc4ae: add new message keys to maintenance scripts"
Siebrand [Wed, 9 May 2012 09:11:26 +0000 (09:11 +0000)]
Merge "Follow up change Icc8dc4ae: add new message keys to maintenance scripts"

11 years agoRemove UI overrides for simple English.
Siebrand Mazeland [Wed, 9 May 2012 07:26:26 +0000 (09:26 +0200)]
Remove UI overrides for simple English.

This was introduced a while ago, but this code should simply fall back to
English completely.

Change-Id: If311c2b6847068bdca6dd44d294ca207639a9f5b

11 years agoFollow up change Icc8dc4ae: add new message keys to maintenance scripts
raymond [Wed, 9 May 2012 07:00:07 +0000 (09:00 +0200)]
Follow up change Icc8dc4ae: add new message keys to maintenance scripts

Change-Id: Ic7040fb32044bf8b500c081881e4b29261f1296b

11 years agoMerge "fix bug 29002 - in RTL wikis resizable are flipped"
Krinkle [Wed, 9 May 2012 06:59:31 +0000 (06:59 +0000)]
Merge "fix bug 29002 - in RTL wikis resizable are flipped"

11 years agoMerge "HTTP: Fix ded6170bd2072971f72db794f3ab1625a8e13475, which broke all HTTP calls."
Krinkle [Wed, 9 May 2012 06:39:08 +0000 (06:39 +0000)]
Merge "HTTP: Fix ded6170bd2072971f72db794f3ab1625a8e13475, which broke all HTTP calls."

11 years agoHTTP: Fix ded6170bd2072971f72db794f3ab1625a8e13475, which broke all HTTP calls.
Aaron [Tue, 8 May 2012 22:18:10 +0000 (15:18 -0700)]
HTTP: Fix ded6170bd2072971f72db794f3ab1625a8e13475, which broke all HTTP calls.

* respHeaders contains arrays for each header (should've been
  respHeaders['content-length'][0] instead of respHeaders['content-length'])
  using getResponseHeader() instead.
* This also fixes InstantCommons, which was broken by this (bug 36653).
* Also cleaned up a bit of w/s in foreign repo code while in the area.

Change-Id: I429b0a36618cc2b873077516e9c1023dc5b7d693

11 years agoMerge "(bug 36669) Installer CSS outdated"
Timo Tijhof [Wed, 9 May 2012 06:09:42 +0000 (06:09 +0000)]
Merge "(bug 36669) Installer CSS outdated"

11 years agoRemove 'jquery.ui.button' as dependency for mediawiki.action.history
Timo Tijhof [Wed, 9 May 2012 03:08:26 +0000 (05:08 +0200)]
Remove 'jquery.ui.button' as dependency for mediawiki.action.history

- Follows-up 91c38e63da79e1bf426907f052e156140716e653
  which last updated this module after which jquery.ui was no longer
  used.

Change-Id: If8c6b64ca76dd4c03e8c65145efba30e579e39a8

11 years agoMerge "Upgrade to jQuery UI 1.8.20"
Krinkle [Wed, 9 May 2012 03:04:00 +0000 (03:04 +0000)]
Merge "Upgrade to jQuery UI 1.8.20"

11 years ago[FileRepo] Purging/transaction fixes.
Aaron [Wed, 9 May 2012 00:29:34 +0000 (17:29 -0700)]
[FileRepo] Purging/transaction fixes.

* Purge old version thumbnails on move
* Pushed purge operations outside of the DB transaction for move/delete

Change-Id: I260940149599eea814226d3c5b7092f4d6544a72

11 years ago(bug 36669) Installer CSS outdated
Timo Tijhof [Wed, 9 May 2012 00:08:04 +0000 (02:08 +0200)]
(bug 36669) Installer CSS outdated

Change-Id: I7ac606f2e8538eb5fd10a3944cf9d8b42bbc5ed5

11 years agoMerge "Checking out RELEASE-NOTES-1.19 from branch gerrit/REL1_19"
Timo Tijhof [Wed, 9 May 2012 00:15:01 +0000 (00:15 +0000)]
Merge "Checking out RELEASE-NOTES-1.19 from branch gerrit/REL1_19"

11 years agoChecking out RELEASE-NOTES-1.19 from branch gerrit/REL1_19
Timo Tijhof [Wed, 9 May 2012 00:14:32 +0000 (02:14 +0200)]
Checking out RELEASE-NOTES-1.19 from branch gerrit/REL1_19

- File was updated inside the branch, updating master.

Change-Id: Ie54e621a1ce5494d98bcd76d4c858c0ed423e581

11 years agoMerge changes Ic19071c7,Icc8dc4ae
Aaron Schulz [Tue, 8 May 2012 22:54:59 +0000 (22:54 +0000)]
Merge changes Ic19071c7,Icc8dc4ae

* changes:
  Message documentation for Icc8dc4ae (circular references in strip tags)
  (bug 35315) Detect circular references in strip tags

11 years agoMerge "Typo in comment"
Siebrand [Tue, 8 May 2012 21:55:36 +0000 (21:55 +0000)]
Merge "Typo in comment"

11 years agoMerge "Re-enable css @import unit tests"
Catrope [Tue, 8 May 2012 21:54:22 +0000 (21:54 +0000)]
Merge "Re-enable css @import unit tests"

11 years agoTypo in comment
Platonides [Tue, 8 May 2012 21:27:21 +0000 (23:27 +0200)]
Typo in comment

Change-Id: Ic5e1451f86d7bcda374fd12b5a9b85fe199a7c1a

11 years agoLocalisation updates from http://translatewiki.net.
Translation updater bot [Tue, 8 May 2012 20:51:32 +0000 (20:51 +0000)]
Localisation updates from translatewiki.net.

Change-Id: I787349e3479ad12431d82ead7c9ae58f3675fd66

11 years agoMerge "Show descriptive error message on invalid title instead of showing an empty...
Brion VIBBER [Tue, 8 May 2012 20:47:59 +0000 (20:47 +0000)]
Merge "Show descriptive error message on invalid title instead of showing an empty line"

11 years agoMerge "Optimized SqlBagOStuff::getBatch() a bit."
Brion VIBBER [Tue, 8 May 2012 20:30:55 +0000 (20:30 +0000)]
Merge "Optimized SqlBagOStuff::getBatch() a bit."

11 years agoMerge "(bug 35993) gettoken should go die in a fire (part 1)"
Brion VIBBER [Tue, 8 May 2012 20:26:28 +0000 (20:26 +0000)]
Merge "(bug 35993) gettoken should go die in a fire (part 1)"

11 years agoMerge "Make backupTestPass.inc require_once by itself its dependence on backup.inc...
Brion VIBBER [Tue, 8 May 2012 20:24:27 +0000 (20:24 +0000)]
Merge "Make backupTestPass.inc require_once by itself its dependence on backup.inc Change path-less requires to full path ones."

11 years agoMerge "[FileRepo] Locking and transaction fixes."
Brion VIBBER [Tue, 8 May 2012 20:21:44 +0000 (20:21 +0000)]
Merge "[FileRepo] Locking and transaction fixes."

11 years agoMerge "Add new-inline-tags to tidy.conf"
Brion VIBBER [Tue, 8 May 2012 20:15:52 +0000 (20:15 +0000)]
Merge "Add new-inline-tags to tidy.conf"

11 years agoShow descriptive error message on invalid title instead of showing an empty line
Alexandre Emsenhuber [Tue, 8 May 2012 19:34:40 +0000 (21:34 +0200)]
Show descriptive error message on invalid title instead of showing an empty line

Change-Id: Ided20c465fee37087239a0caef01c7427c5ceeef

11 years agoMerge "(bug 36568) Fixed "Illegal string offset 'LIMIT'" warnings in updater"
Brion VIBBER [Tue, 8 May 2012 18:56:41 +0000 (18:56 +0000)]
Merge "(bug 36568) Fixed "Illegal string offset 'LIMIT'" warnings in updater"

11 years agoMerge "Don't make two database requests to load the same object, again."
Aaron Schulz [Tue, 8 May 2012 18:50:14 +0000 (18:50 +0000)]
Merge "Don't make two database requests to load the same object, again."

11 years agoMerge "(bug 20189) Added 'Show/hide selected revisions' button and checkboxes to...
Brion VIBBER [Tue, 8 May 2012 18:36:05 +0000 (18:36 +0000)]
Merge "(bug 20189) Added 'Show/hide selected revisions' button and checkboxes to Special:Log."

11 years agoMerge "[FileBackend] File locking fixes."
Brion VIBBER [Tue, 8 May 2012 18:30:18 +0000 (18:30 +0000)]
Merge "[FileBackend] File locking fixes."

11 years agoMerge "Make getContinueStr protected as it's used in subclass by TMH"
Brion VIBBER [Tue, 8 May 2012 18:28:30 +0000 (18:28 +0000)]
Merge "Make getContinueStr protected as it's used in subclass by TMH"

11 years agoMerge "Include the namespace of the page in the "target" parameter of the form to...
Brion VIBBER [Tue, 8 May 2012 18:27:46 +0000 (18:27 +0000)]
Merge "Include the namespace of the page in the "target" parameter of the form to confirm display of a deleted file."

11 years agoMerge "ORDER BY/GROUP BY accept arrays"
Brion VIBBER [Tue, 8 May 2012 18:10:37 +0000 (18:10 +0000)]
Merge "ORDER BY/GROUP BY accept arrays"

11 years agoMake getContinueStr protected as it's used in subclass by TMH
Reedy [Tue, 8 May 2012 18:08:43 +0000 (19:08 +0100)]
Make getContinueStr protected as it's used in subclass by TMH

Change-Id: I3bd265805122d3ae12b986d1396ca634ca9f8097

11 years agoMerge "Fix comment ResourceLoader::tryRespondFromFileCache()."
Aaron Schulz [Tue, 8 May 2012 17:23:38 +0000 (17:23 +0000)]
Merge "Fix comment ResourceLoader::tryRespondFromFileCache()."

11 years agoMerge "Added Linker::getInvalidTitleDescription() to display invalid title entries...
Hashar [Tue, 8 May 2012 16:12:58 +0000 (16:12 +0000)]
Merge "Added Linker::getInvalidTitleDescription() to display invalid title entries in various places."

11 years agoMerge "Use CamelCase in both ConfirmEmail and InvalidateEmail page names."
Nikerabbit [Tue, 8 May 2012 15:58:29 +0000 (15:58 +0000)]
Merge "Use CamelCase in both ConfirmEmail and InvalidateEmail page names."

11 years agoFix comment ResourceLoader::tryRespondFromFileCache().
Alexandre Emsenhuber [Tue, 8 May 2012 15:53:59 +0000 (17:53 +0200)]
Fix comment ResourceLoader::tryRespondFromFileCache().

Mention ResourceFileCache instead of ObjectFileCache for the $fileCache parameter since the signature is
function tryRespondFromFileCache( ResourceFileCache $fileCache, ResourceLoaderContext $context )

Change-Id: I8e738c847ea358117a2a9b54f41fdb10308e2656

11 years agoAdded missing GPLv2 headers in some places.
Alexandre Emsenhuber [Tue, 8 May 2012 12:51:21 +0000 (14:51 +0200)]
Added missing GPLv2 headers in some places.

Also made file/class documentation more consistent.

Change-Id: I604ed8ddc572e89001e49df6740ab42307bc0330

11 years agoInclude the namespace of the page in the "target" parameter of the form to confirm...
Alexandre Emsenhuber [Fri, 4 May 2012 12:32:10 +0000 (14:32 +0200)]
Include the namespace of the page in the "target" parameter of the form to confirm display of a deleted file.

Currently the name of the file is sent without the "File:" prefix making MediaWiki think we want to display a page in the main namespace.

Change-Id: I5a42764c8e9289d13b95a1989be63fdf357bc6ef

11 years agoUse CamelCase in both ConfirmEmail and InvalidateEmail page names.
Liangent [Tue, 8 May 2012 09:25:03 +0000 (17:25 +0800)]
Use CamelCase in both ConfirmEmail and InvalidateEmail page names.

Change-Id: I2685023eff58479f0eecd3d6ff416cbe22ee425a

11 years ago[FileBackend] File locking fixes.
Aaron Schulz [Wed, 11 Apr 2012 04:56:42 +0000 (21:56 -0700)]
[FileBackend] File locking fixes.

* Fixed unlocking logic in FSLockManager for case when an EX lock was made, then an SH one, and then the EX one was "unlocked"
* Avoid hiding useful unlink() warnings in FSLockManager
* Reduced locking use in test cleanup code
* Added a simple testLockCalls() test function
* Made a few cleanups & fixes to backend tests

Change-Id: I1110d9b537c450d9feca5a2fb35519c22435e81d

11 years agoMessage documentation for Icc8dc4ae (circular references in strip tags)
Tim Starling [Tue, 8 May 2012 04:49:35 +0000 (14:49 +1000)]
Message documentation for Icc8dc4ae (circular references in strip tags)

Change-Id: Ic19071c752df87bb8efe6852599563cd1d036b6e

11 years ago(bug 35315) Detect circular references in strip tags
Tim Starling [Mon, 23 Apr 2012 02:03:02 +0000 (12:03 +1000)]
(bug 35315) Detect circular references in strip tags

Explicitly detect circular references in strip tags and break the loop,
similar to how we deal with circular references in templates. This is
necessary to support Scribunto since we imagine we will provide an API
that allows strip markers to be forged.

The recursion depth limit is a consequence of changing the algorithm
from iterative to recursive, it's required to protect the stack against
deeply nested #tag invocations.

Change-Id: Icc8dc4aedbced55ad75b3b5a5429a376d06d9b31

11 years ago(bug 20189) Added 'Show/hide selected revisions' button and checkboxes to Special...
Alex Monk [Tue, 8 May 2012 01:32:15 +0000 (02:32 +0100)]
(bug 20189) Added 'Show/hide selected revisions' button and checkboxes to Special:Log.

Change-Id: I2c4d4e1234d5ab9f7d514831351ea3b298811165

11 years agoFix for r113993: don't log UsageException instances
Tim Starling [Tue, 8 May 2012 01:02:55 +0000 (11:02 +1000)]
Fix for r113993: don't log UsageException instances

Change-Id: I205252534fcf7a0ee486938123c1e15cd036f4f1

11 years agoMerge "Make $wgShowExceptionDetails=false more feasible for production"
Demon [Tue, 8 May 2012 00:06:03 +0000 (00:06 +0000)]
Merge "Make $wgShowExceptionDetails=false more feasible for production"

11 years agoMake $wgShowExceptionDetails=false more feasible for production
Tim Starling [Mon, 7 May 2012 23:53:58 +0000 (09:53 +1000)]
Make $wgShowExceptionDetails=false more feasible for production

* Make the HTML error message prettier, with a nice red box and
  instructions to modify LocalSettings.php hidden in an HTML comment.
* Show the exception class name, since that's pretty safe.
* Show a random "log ID" to the user, and also send it to the exception
  log, to allow easier log correlation.
* Optionally send backtraces to the error log, enabled by default.

Change-Id: Ie92e46032b3d194c4217119567847a38a53be577

11 years agoFixing fatal error - you can't call getUser on a WebRequest object
Kaldari [Mon, 7 May 2012 23:30:48 +0000 (16:30 -0700)]
Fixing fatal error - you can't call getUser on a WebRequest object

Change-Id: I323e9c39cd89673b7e369df3b77573e51f4ea2e3

11 years agoMerge "Treat truncated HTTP requests as errors."
Aaron Schulz [Mon, 7 May 2012 23:21:56 +0000 (23:21 +0000)]
Merge "Treat truncated HTTP requests as errors."

11 years agoMerge "add type check and bail out when title could not be created"
Aaron Schulz [Mon, 7 May 2012 23:03:02 +0000 (23:03 +0000)]
Merge "add type check and bail out when title could not be created"

11 years agoMerge "Let tablesUsed imply needsDB in MediaWikiTestCase."
Aaron Schulz [Mon, 7 May 2012 22:59:22 +0000 (22:59 +0000)]
Merge "Let tablesUsed imply needsDB in MediaWikiTestCase."

11 years agoMerge "fix 2 missing "local var" JavaScript statements"
Aaron Schulz [Mon, 7 May 2012 22:56:45 +0000 (22:56 +0000)]
Merge "fix 2 missing "local var" JavaScript statements"

11 years agoMerge "Adding $this->tablesUsed to RevisionStorageTest."
Aaron Schulz [Mon, 7 May 2012 22:53:13 +0000 (22:53 +0000)]
Merge "Adding $this->tablesUsed to RevisionStorageTest."

11 years agoAdding test case for basic WikiPage functionality, including database interaction.
daniel [Wed, 2 May 2012 17:35:42 +0000 (19:35 +0200)]
Adding test case for basic WikiPage functionality, including database interaction.

New tests are added to avoid regressions when the ContentHandler facility
is introduced.

Changeset 3: use tablesUsed to allow database cleanup after test, as per
             Aaron's suggestion.

Changeset 4: use array_merge instead of +=.

Changeset 5: trying dumber rollback test to see of jenkins likes it better.

Change-Id: I0a9f8dfd30031baa4b12cc128a39059868149884

11 years agoLet tablesUsed imply needsDB in MediaWikiTestCase.
daniel [Fri, 4 May 2012 14:02:09 +0000 (16:02 +0200)]
Let tablesUsed imply needsDB in MediaWikiTestCase.

If the test says it uses database tables, then it needs the database.

And while we are at it, make the check for the test group declaration
more lenient.

Patch set 2: tweaked according to demon's comments.

Change-Id: Ib123745d45b85cebeab5ec87ea7d8227ec3d1dea

11 years agoTreat truncated HTTP requests as errors.
Platonides [Mon, 7 May 2012 21:13:04 +0000 (23:13 +0200)]
Treat truncated HTTP requests as errors.

We detect such prematurely ended request when there's a Content-Length
greater than the body we got. A strict comparison would easily fail
when there was a content encoding layer, but hopefully we won't hit
a compressed request _larger_ than the original content.

See http://thread.gmane.org/gmane.org.wikimedia.mediawiki/39622
for breakage caused by truncated HTTP replies.

Change-Id: I71418424730d46a781bde5cbfda8038457ec79c5

11 years agoAdding $this->tablesUsed to RevisionStorageTest.
daniel [Wed, 2 May 2012 17:34:35 +0000 (19:34 +0200)]
Adding $this->tablesUsed to RevisionStorageTest.

This is a follow-up to I6934d03e (no 6414).

Declare tables in $this->tablesUsed to allow for database clenaup,
as Aaron suggested.

Change-Id: Iac05b0428b335879729f6d3b993eac0d3151429c

11 years agoMerge "(bug 36603) Make DumpFilter::$sink public again"
Antoine Musso [Mon, 7 May 2012 21:39:14 +0000 (21:39 +0000)]
Merge "(bug 36603) Make DumpFilter::$sink public again"

11 years ago(bug 36603) Make DumpFilter::$sink public again
Antoine Musso [Mon, 7 May 2012 21:34:07 +0000 (14:34 -0700)]
(bug 36603) Make DumpFilter::$sink public again

This is required by dump unit testing for now. The change was introduced
by commit ab6e54e0 https://gerrit.wikimedia.org/r/#/c/6089/

We will have to update the Dump tests to no more reference sink directly
but use a proper accessing method that has yet to be written.

Change-Id: I1246739c4ea174b13af475db8cfcb48740ecc2df

11 years agoLocalisation updates from http://translatewiki.net.
Translation updater bot [Mon, 7 May 2012 21:19:42 +0000 (21:19 +0000)]
Localisation updates from translatewiki.net.

Added language file for "sat", updated Names.php and RELEASE-NOTES.

Change-Id: I2dbe696fbe5b98352895fe1be2de96eb767b2b0b

11 years agoMerge "Made WikiPage recall the source of the data used to load its state."
Aaron Schulz [Mon, 7 May 2012 17:44:34 +0000 (17:44 +0000)]
Merge "Made WikiPage recall the source of the data used to load its state."

11 years agoMerge "Adding tests for dumps"
Hashar [Mon, 7 May 2012 16:39:14 +0000 (16:39 +0000)]
Merge "Adding tests for dumps"

11 years agoAdded Linker::getInvalidTitleDescription() to display invalid title entries in variou...
Alexandre Emsenhuber [Tue, 10 Apr 2012 09:28:48 +0000 (11:28 +0200)]
Added Linker::getInvalidTitleDescription() to display invalid title entries in various places.

This method will use two new messages 'invalidtitle-knownnamespace' and 'invalidtitle-unknownnamespace' depending on the fact that the given namespace number exists or not.
I did put that method in Linker because I plan to use it in various places, notably in other QueryPage and Pager subclasses.

Change-Id: I13e7cdc2c0a8e86dc5e4b144b6012f3864d2ec06

11 years ago(bug 36568) Fixed "Illegal string offset 'LIMIT'" warnings in updater
Alexandre Emsenhuber [Mon, 7 May 2012 13:52:55 +0000 (15:52 +0200)]
(bug 36568) Fixed "Illegal string offset 'LIMIT'" warnings in updater

No RELEASE-NOTES entry since this is going to be backported and RELEASE-NOTES-1.19 is out of sync.

Change-Id: I1ec6c824677606ac6f93cc43345942e4de8bd3f4

11 years agoMerge "Localisation updates from http://translatewiki.net."
Demon [Mon, 7 May 2012 12:32:20 +0000 (12:32 +0000)]
Merge "Localisation updates from translatewiki.net."

11 years agoMerge "(bug 36537) Rename wfArrayToCGI to wfArrayToCgi"
Demon [Mon, 7 May 2012 12:26:34 +0000 (12:26 +0000)]
Merge "(bug 36537) Rename wfArrayToCGI to wfArrayToCgi"

11 years agoMerge "Pass the result of the database queries in Title::getPreviousRevisionID()...
Siebrand [Mon, 7 May 2012 10:22:46 +0000 (10:22 +0000)]
Merge "Pass the result of the database queries in Title::getPreviousRevisionID() and Title::getNextRevisionID() into intval()."

11 years agoMade WikiPage recall the source of the data used to load its state.
Alexandre Emsenhuber [Thu, 26 Apr 2012 20:59:19 +0000 (22:59 +0200)]
Made WikiPage recall the source of the data used to load its state.

In WikiPage.php:
* Added WikiPage::$mDataLoadedFrom to store the source of the data used to load the state of the object and four new WikiPage::DATA_* constants for its possible values.
* Added WikiPage::convertSelectType() to convert 'fromdb', 'fromdbmaster' and 'forupdate' to the new WikiPage::DATA_* constants.
* Added $options to WikiPage::pageData(), WikiPage::pageDataFromTitle() and WikiPage::pageDataFromId() so that the "FOR UPDATE" option can be passed to DatabaseBase::select().
* Added new possibility "forupdate" to WikiPage::loadPageData() load the data from the master database using SELECT FOR UPDATE; this avoids to have to do this by LinkCache (via Title::getArticleID( Title::GAID_FOR_UPDATE ) )).
* Changed WikiPage::doDeleteArticleReal() to use this new feature so that all the data stored in WikiPage is up-to-date.

My point is also to deprecate the loading using SELECT FOR UPDATE in Title and remove LinkCache::forUpdate() at some point (there are still one usage in Title::moveTo(), two other in UploadFromUrlTest plus some in extensions).

In EditPage.php:
* Don't call WikiPage::clear() after fetching informations from master, this destroys all we work we did to get the correct data.
* Reload the whole data from master using SELECT FOR UPDATE directly in WikiPage and not only in Title. The problem was that before, the up-to-date information was only available in Title and not in WikiPage.
  Consider the following sequence from a MySQL prompt (where both revision 1 and 2 belong to page one, revision #2 being the current one):

mysql> UPDATE page SET page_latest=1 WHERE page_id=1;
mysql> COMMIT;
// Now grad the edit form for page #1 from the web and do some changes
mysql> BEGIN;
mysql> SELECT page_latest FROM page WHERE page_id=1 FOR UPDATE;
// Now submit the web form
mysql> UPDATE page SET page_latest=2 WHERE page_id=1;
mysql> COMMIT;

Before you ended-up with a "edit conflict" form with revision #1's text being displayed as current text (even if the texts are mergeable), due to the fact that
in the submit request the WikiPage object was loaded at the moment where page_latest was 1 (certainly due to MySQL's "consistent read" feature) making the
"UPDATE page SET ... WHERE page_id=1 AND page_latest=1" query of WikiPage::updateRevisionOn() return zero row, and thus WikiPage::doEdit returing a fatal Status object with message "edit-conflict".
Now the SELECT FOR UPDATE is done in the WikiPage, meaning that the object has the correct data and EditPage will correctly try to merge the revisions (and show the correct edit conflict if needed).

Change-Id: Ic4878ddb4dd96432b7ecaf43f9f359458d966999

11 years agoAdded missing GPLv2 headers in some places.
Alexandre Emsenhuber [Mon, 7 May 2012 07:11:33 +0000 (09:11 +0200)]
Added missing GPLv2 headers in some places.

Also made file/class documentation more consistent.

Change-Id: Iad15427368d13a6cc11c8512b7265e8c7b8878a5

11 years ago[FileRepo] Locking and transaction fixes.
Aaron Schulz [Mon, 7 May 2012 06:28:03 +0000 (23:28 -0700)]
[FileRepo] Locking and transaction fixes.

* Make sure locks for file moves cover the whole operation.
* Pushed purging out of the move/delete/restore transactions.

Change-Id: I398c5627808fa79739f0dee632c4edf7416507c1

11 years agoMerge "$wgGitRepositoryViewers to link to gitweb"
Aaron Schulz [Mon, 7 May 2012 01:13:04 +0000 (01:13 +0000)]
Merge "$wgGitRepositoryViewers to link to gitweb"

11 years agoMerge "Added missing GPLv2 headers in some places."
Siebrand [Sun, 6 May 2012 21:12:29 +0000 (21:12 +0000)]
Merge "Added missing GPLv2 headers in some places."

11 years agoMake backupTestPass.inc require_once by itself its dependence on backup.inc
Platonides [Sun, 6 May 2012 20:31:03 +0000 (22:31 +0200)]
Make backupTestPass.inc require_once by itself its dependence on backup.inc
Change path-less requires to full path ones.

Change-Id: Ida37a3ec9bb1d5c99f4bbbf6d967cb40d0442e38

11 years agoAdd new-inline-tags to tidy.conf
Jan Gerber [Wed, 2 May 2012 12:49:35 +0000 (14:49 +0200)]
Add new-inline-tags to tidy.conf

by default tidy does not support html5 tags.
TimedMediaHandler outputs video, audio and source
To make TimedMediaHandler work with $wgUseTidy = true,
those tags need to be allowed in tidy.conf:
new-inline-tags: video,audio,source,track

Fixes #30541

Change-Id: I528c9521e9277be308a6a75cc3fc57c83905b5df

11 years ago$wgGitRepositoryViewers to link to gitweb
saper [Sun, 6 May 2012 20:12:14 +0000 (22:12 +0200)]
$wgGitRepositoryViewers to link to gitweb

My git remote is configured just to be ssh://review/mediawiki/core.git
and I have "review" set up in $HOME/.ssh/config.

Unfortunately, I need to change git remote URLs to make sure
the repository is linked from Special:Version.

This shouldn't be necessary; either we should fallback to the
official MediaWiki git repository or we should add the configuration
option to adapt to local needs.

Change-Id: I2e0b6470c16ec36d0e94cceab844f4a4c4334067

11 years agoLocalisation updates from http://translatewiki.net.
Translation updater bot [Sun, 6 May 2012 18:31:11 +0000 (18:31 +0000)]
Localisation updates from translatewiki.net.

Change-Id: I731ab96929dac09112de978b4ed387b044893d36

11 years ago(bug 35993) gettoken should go die in a fire (part 1)
Szymon Świerkosz [Sun, 6 May 2012 14:43:09 +0000 (16:43 +0200)]
(bug 35993) gettoken should go die in a fire (part 1)

Mark gettoken param as deprecated, so users can fix their tools.
The second part will remove the support for gettoken from ApiMain,
but that is in the future.

Change-Id: I369ddc740c38d80aa8389544087ac6671cabc618

11 years agoMove optionstoken from meta=userinfo to action=tokens.
Szymon Świerkosz [Fri, 4 May 2012 10:31:08 +0000 (12:31 +0200)]
Move optionstoken from meta=userinfo to action=tokens.

Follow up to I0d6c654a7354ba77e65e338423952a6a78c1150f.
I have also added a URL to a help page on mw.org.

Change-Id: Ie223930cfc313aff150e2dcfd70b74bf4360a8a8

11 years agoAdded missing GPLv2 headers in some places.
Alexandre Emsenhuber [Sun, 6 May 2012 05:50:15 +0000 (07:50 +0200)]
Added missing GPLv2 headers in some places.

Also made file/class documentation more consistent.

Change-Id: I1615bf268515ed7169e33173cea6ec30402451dc

11 years ago(bug 33224) add variants of content language to meta=siteinfo
umherirrender [Sat, 5 May 2012 17:29:48 +0000 (19:29 +0200)]
(bug 33224) add variants of content language to meta=siteinfo

Change-Id: I0b92e1e626f0c5bc543c5d134eb44d7ca7722217

11 years agoFix typo and small error in release notes.
Erik Moeller [Sat, 5 May 2012 22:35:06 +0000 (15:35 -0700)]
Fix typo and small error in release notes.

Change-Id: I6855a441c2924a0c7d659909b825c79e324a51a7

11 years ago(bug 28814) add properties to output of action=parse
umherirrender [Sat, 5 May 2012 18:08:58 +0000 (20:08 +0200)]
(bug 28814) add properties to output of action=parse

Change-Id: I27cf2daaf6f34596bc34aac230601d5688a0066f

11 years ago(bug 34927) Output media_type for list=filearchive
umherirrender [Sat, 5 May 2012 18:24:27 +0000 (20:24 +0200)]
(bug 34927) Output media_type for list=filearchive

Change-Id: I7c9b2f614ab319facfc9fb30893d82a9427e4253

11 years ago(bug 36537) Rename wfArrayToCGI to wfArrayToCgi
Timo Tijhof [Sat, 5 May 2012 17:02:58 +0000 (19:02 +0200)]
(bug 36537) Rename wfArrayToCGI to wfArrayToCgi

- For consistency with wfCgiToArray()
  This way instead of the other way around to keep lowerCamelCase natural.

Change-Id: If4528f6572afeab42ef0602a427ac44da9830a3f

11 years agoUse right case for Title::makeTitle
umherirrender [Sat, 5 May 2012 14:08:47 +0000 (16:08 +0200)]
Use right case for Title::makeTitle

Change-Id: Ia91b3679f03eefb9970a790c784a92ea6fb0c274

11 years agofix 2 missing "local var" JavaScript statements
vlakoff [Sat, 5 May 2012 13:55:50 +0000 (15:55 +0200)]
fix 2 missing "local var" JavaScript statements

Change-Id: I0e8a5824be635e526c385f3168ffc6269928a05c

11 years agoORDER BY/GROUP BY accept arrays
umherirrender [Sat, 5 May 2012 13:29:08 +0000 (15:29 +0200)]
ORDER BY/GROUP BY accept arrays

renaming all variable which hold "' DESC'" to $sort
to keep it all the same

Change-Id: I75118f8cdd701f53949fe5cdd7155fb07f78ff65

11 years agoMerge "Use $wgExpensiveParserFunctionLimit over ParserOptions"
Aaron Schulz [Sat, 5 May 2012 09:32:28 +0000 (09:32 +0000)]
Merge "Use $wgExpensiveParserFunctionLimit over ParserOptions"