daniel [Tue, 17 Apr 2012 19:02:03 +0000 (21:02 +0200)]
renamed getDifferenceEngine to createDifferenceEngine
daniel [Tue, 17 Apr 2012 16:25:37 +0000 (18:25 +0200)]
added Content::copy()
daniel [Tue, 17 Apr 2012 16:09:17 +0000 (18:09 +0200)]
Merge branch 'Wikidata' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into Wikidata
daniel [Tue, 17 Apr 2012 16:08:23 +0000 (18:08 +0200)]
renamed emptyContent to makeEmptyContent
daniel [Tue, 17 Apr 2012 16:04:27 +0000 (18:04 +0200)]
renamed serialize/unserialize to serializeContent/unserializeContent
jeroendedauw [Tue, 17 Apr 2012 15:55:20 +0000 (17:55 +0200)]
pass context instead of title to getParserOutput
Change-Id: I5787b523a871b0a73f4ca174a761f22aa394c9fd
daniel [Tue, 17 Apr 2012 15:54:00 +0000 (17:54 +0200)]
use ParserOutput::getSecondaryDataUpdates() as the primary method of getting pending updates
jeroendedauw [Tue, 17 Apr 2012 15:34:18 +0000 (17:34 +0200)]
contextSource instead of Title
Change-Id: Ia2eb56873ec65fc642df89d996ab3097fd20adf8
jeroendedauw [Tue, 17 Apr 2012 15:11:26 +0000 (17:11 +0200)]
fix typo
Change-Id: I72b511b77f8067411bf234255ad0d54a96ed9cf3
daniel [Mon, 16 Apr 2012 18:53:49 +0000 (20:53 +0200)]
Merge branch 'Wikidata' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into Wikidata
daniel [Mon, 16 Apr 2012 18:52:30 +0000 (20:52 +0200)]
another attempt to merge EditPage (untested)
Nikola Smolenski [Mon, 16 Apr 2012 15:47:29 +0000 (17:47 +0200)]
Merge branch 'Wikidata' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into Wikidata
Nikola Smolenski [Mon, 16 Apr 2012 15:45:51 +0000 (17:45 +0200)]
New API format 'none', used to minimize the response size when the output is not needed.
Change-Id: I0308d16ea04735bc27ac4a3526baec44ccd426f1
jeroendedauw [Mon, 16 Apr 2012 15:30:23 +0000 (17:30 +0200)]
Merge branch 'Wikidata' of ssh://review/mediawiki/core into Wikidata
daniel [Mon, 16 Apr 2012 15:24:13 +0000 (17:24 +0200)]
merging incoming
jeroendedauw [Mon, 16 Apr 2012 14:59:56 +0000 (16:59 +0200)]
Merge branch 'Wikidata' of ssh://review/mediawiki/core into Wikidata
jeroendedauw [Mon, 16 Apr 2012 14:59:44 +0000 (16:59 +0200)]
add fixme
Change-Id: I0890c716baa9b9aa91a6c555ec3468db90db5f12
daniel [Mon, 16 Apr 2012 14:55:43 +0000 (16:55 +0200)]
allow CotentHandler to override actions
daniel [Mon, 16 Apr 2012 12:13:03 +0000 (14:13 +0200)]
documenting Content class
Change-Id: Ic46783d6526002ce9006ffbe1385272782ee5221
daniel [Mon, 16 Apr 2012 10:35:38 +0000 (12:35 +0200)]
more documentation for ContentHandler
Change-Id: I7188a575f254dea30a571f0b217c85427f4d97af
daniel [Mon, 16 Apr 2012 09:52:37 +0000 (11:52 +0200)]
Merge branch 'Wikidata' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into Wikidata
Getting synced after Jeroen and Jens essentially rebased the core branch.
Conflicts:
includes/ContentHandler.php
Change-Id: I82efd272694ec5761fedf52f85b153a140e268e5
daniel [Mon, 16 Apr 2012 09:01:56 +0000 (11:01 +0200)]
some documentation for ContentHandler
Change-Id: Ie1929d8d0a0ef2396cfcf8720622aa103d1ba151
daniel [Mon, 16 Apr 2012 07:12:34 +0000 (09:12 +0200)]
make html generation optional in Content::getParserOutput
Change-Id: Ie1c6588057dbce1a5e6955ebcbd9905df53b2f5a
daniel [Mon, 16 Apr 2012 07:08:35 +0000 (09:08 +0200)]
EditPage::getOriginalContent should not use Article::getContent
Change-Id: I7563b569e18e6b1a6068c54f3414baba14416d18
daniel [Mon, 16 Apr 2012 06:49:38 +0000 (08:49 +0200)]
make Article::getContentObject() protected. Not a good way to get revision content\!
Change-Id: I20dbace60e8d5b95e858e00595809171dba4c555
jeroendedauw [Thu, 12 Apr 2012 18:19:41 +0000 (20:19 +0200)]
minor cleanup
Change-Id: I0c1dfde7a4b17b3f5d42f0b717cc2ccef383833a
jeroendedauw [Thu, 12 Apr 2012 14:01:33 +0000 (16:01 +0200)]
minor cleanup, added todos and attempted (but aborted) refactoring to make stuff more sane
Change-Id: I3f57ee2c28861462cf46fc3af13c4ab0cb6aa960
jeroendedauw [Wed, 11 Apr 2012 13:45:55 +0000 (15:45 +0200)]
attempt to fix issues due to incorrect merge conflict resolving, might have missed some, and solutions might introduce new issues on their own
Change-Id: I020803b6a7e8b427182ad4c3ddeff99537b99f90
jeroendedauw [Wed, 11 Apr 2012 12:50:54 +0000 (14:50 +0200)]
Merge branch 'Wikidata', remote-tracking branch 'origin/Wikidata' into Wikidata
Jens Ohlig [Wed, 11 Apr 2012 12:26:41 +0000 (14:26 +0200)]
Merge branch 'master' into Wikidata
Jens Ohlig [Wed, 11 Apr 2012 12:24:29 +0000 (14:24 +0200)]
Merge branch 'master' into Wikidata
Conflicts:
.gitreview
includes/Article.php
includes/AutoLoader.php
includes/EditPage.php
includes/LinksUpdate.php
includes/WikiPage.php
includes/installer/Ibm_db2Updater.php
includes/installer/MysqlUpdater.php
includes/installer/OracleUpdater.php
includes/installer/SqliteUpdater.php
maintenance/refreshLinks.php
Niklas Laxström [Wed, 11 Apr 2012 11:23:08 +0000 (11:23 +0000)]
Html::setSubmitTextMsg double escapes
On Dutch the button showed "Pagina's verwijderen"
Change-Id: I082e16e9320ba4aef1e2bf5f81cfe54fdf61b6c3
jeroendedauw [Wed, 11 Apr 2012 10:52:25 +0000 (12:52 +0200)]
Merge branch 'Wikidata' of ssh://review/mediawiki/core into Wikidata
jeroendedauw [Wed, 11 Apr 2012 10:49:43 +0000 (12:49 +0200)]
cleanup and conflict fix
Change-Id: If65cb2393f4765b4f2c3e04f451beba59dea6d97
Brion VIBBER [Tue, 10 Apr 2012 21:10:47 +0000 (21:10 +0000)]
Merge "Follow-up I5b02aa914916f64492c85ce6dcc3272b6406551a (#4335), also put a link in the debug toolbar."
Aaron Schulz [Tue, 10 Apr 2012 20:59:44 +0000 (20:59 +0000)]
Merge "Remove request_with_session/request_without_session"
Brion VIBBER [Tue, 10 Apr 2012 20:54:36 +0000 (20:54 +0000)]
Merge "Employing MediaWikiTestCase's temporary file methods"
Alexandre Emsenhuber [Tue, 10 Apr 2012 08:52:11 +0000 (10:52 +0200)]
Follow-up I5b02aa914916f64492c85ce6dcc3272b6406551a (#4335), also put a link in the debug toolbar.
Now that there is a link on the revision hash in Special:Version, do the same in the debug toolbar.
Change-Id: I953ac70e17e72be68251e3908e164dfa46c68bf5
Brion VIBBER [Tue, 10 Apr 2012 20:42:34 +0000 (20:42 +0000)]
Merge "(bug 33658) support for {{GRAMMAR:}} in jqueryMsg"
Aaron Schulz [Tue, 10 Apr 2012 20:30:26 +0000 (20:30 +0000)]
Merge "makes gitweb URL points to full sha1"
Demon [Tue, 10 Apr 2012 20:30:17 +0000 (20:30 +0000)]
Merge "Normalise categorymembers to take ascending/descending for direction, also adding newer/older to make it like other modules"
Antoine Musso [Tue, 10 Apr 2012 20:20:15 +0000 (22:20 +0200)]
makes gitweb URL points to full sha1
The URL we are crafting are using a short sha1 (7 chars long) which can
have some good chance of pointing to two different sha1. I have seen git
log to use 8 chars from time to time because of sha1 collisions, 62
occurences outu of 45315 commits as of now.
So to play it safe, this patch makes the URL points to the full sha1.
Follow https://gerrit.wikimedia.org/r/4335
5734eac351dcd72f493bfd7547a5f638f582b048 (commit)
9afc1eff1c396a4d0273d2226e316cba2fb44ab0 (merge)
Change-Id: Ic65d0ca89916fe43999b9e3f257d9f322198f9f8
saper [Fri, 30 Mar 2012 03:06:43 +0000 (05:06 +0200)]
bug35572 Blocks appear to succeed w/DB error
Bug 35572 - Blocks appear to succeed even if query fails due to wrong DB
structure
When emulating INSERT IGNORE ignore only SQL Error Code 23505
- unique key violation
http://www.postgresql.org/docs/9.1/interactive/errcodes-appendix.html
All other error codes (missing column, syntex error, whatever)
should unconditionally abort the transaction and show internal
error to the user.
Patchset 2: Fixed whitespace.
Patchset 3: More whitespace. And ()'s.
Patchset 4: Yet more whitespace.
Patchset 5: rebase & fix conflict in release-notes
Change-Id: Ic32bff9fff46bce124273156d224fa01b8adc008
Brion VIBBER [Tue, 10 Apr 2012 19:55:43 +0000 (19:55 +0000)]
Merge "Fix PostgreSQL updater to produce 1.19 schema"
Brion VIBBER [Tue, 10 Apr 2012 19:54:11 +0000 (19:54 +0000)]
Merge "- Fix bug 35076 - More tests, test comments"
Brion VIBBER [Tue, 10 Apr 2012 19:50:53 +0000 (19:50 +0000)]
Merge "Adding temp file/dir management to MediaWikiTestCase"
Catrope [Tue, 10 Apr 2012 18:12:03 +0000 (18:12 +0000)]
Merge "[FileRepo] Added support for temp file repos (to preserve our thumb.php hack)."
jeroendedauw [Tue, 10 Apr 2012 17:47:46 +0000 (19:47 +0200)]
some cleanup
Change-Id: I896eabc88fa03cde23b097b6b7c7de4d49f53632
Nikola Smolenski [Tue, 10 Apr 2012 16:36:51 +0000 (18:36 +0200)]
- Fix bug 35076
- More tests, test comments
(This is the same as r114049.)
Patch set 2: Squash in missed test file
Change-Id: Icaf7fdd11499c64c42b46e442c158f22309345a7
saper [Thu, 22 Mar 2012 02:42:44 +0000 (03:42 +0100)]
Fix PostgreSQL updater to produce 1.19 schema
* PostgresField now reports column default value
* DatabasePostgres::indexAttributes reports index
details
* Perform schema update in one transaction
With this change we can sucessfully update
MediaWiki 1.7.3 schema to trunk^Wmaster
Patch set 2: Rebased against master. PLEASE check carefully
to make sure I got those conflicted files right.
Conflicts:
includes/db/DatabasePostgres.php
includes/installer/PostgresUpdater.php
Change-Id: Iebb6855e8f6f44470bbb1dc5ab9ac1abb513adfe
Aaron Schulz [Tue, 10 Apr 2012 00:12:06 +0000 (17:12 -0700)]
Merged r114672 from wmf1.19 plus tests; crosswiki block name/id fix.
Change 1:
* Delete any pre-existing block for the tests
* Renamed test function and fixed comment typo
Change-Id: I4804ccae81dd0455e9d3ddf48960c4b5cd6e4f5f
Niklas Laxström [Tue, 10 Apr 2012 16:36:41 +0000 (16:36 +0000)]
Partial revert of I80a47844 for (sr)
Opposed in
http://translatewiki.net/wiki/Thread:Support/GENDER_in_namespaces
Change-Id: Ied65e2fb7e2021eb8ac2b1f134647e69910722cf
Reedy [Tue, 10 Apr 2012 15:31:14 +0000 (15:31 +0000)]
Merge "Avoid PHP Notices in Translate from messages.inc"
Translation updater bot [Tue, 10 Apr 2012 15:20:26 +0000 (15:20 +0000)]
Translation updates from translatewiki.net
Change-Id: I90e86283886a7e9fd0da3c31deda4140c7a35741
Niklas Laxström [Tue, 10 Apr 2012 15:17:01 +0000 (15:17 +0000)]
Avoid PHP Notices in Translate from messages.inc
Caused by missing block comment
Change-Id: I2951b56a290dac9b4f96ffa4ff19dfab81c8c3db
Christian Aistleitner [Tue, 10 Apr 2012 14:57:15 +0000 (16:57 +0200)]
Employing MediaWikiTestCase's temporary file methods
Change-Id: Ide86541abf6642791c1466a2075436a9df6bdbed
Christian Aistleitner [Tue, 10 Apr 2012 14:28:42 +0000 (16:28 +0200)]
Adding temp file/dir management to MediaWikiTestCase
Change-Id: I4ac8f44f1d681925af231377e9d1b984488d3198
Reedy [Tue, 10 Apr 2012 13:08:11 +0000 (14:08 +0100)]
Add some spacing
Change-Id: Ideda1f4343cb57259fcce7ac396519e3c50a6c83
Reedy [Tue, 10 Apr 2012 13:01:30 +0000 (14:01 +0100)]
Normalise categorymembers to take ascending/descending for direction, also adding newer/older to make it like other modules
Change-Id: I50c770b8d48548988a71bcf62b76a9c43fc1622f
Siebrand Mazeland [Tue, 10 Apr 2012 12:00:39 +0000 (14:00 +0200)]
Fix typo in 'filereadonlyerror'.
We do pre-merge review, don't we?
Change-Id: I18516d7c9676bf02e58865c545252e718014e0b9
Alexandre Emsenhuber [Tue, 10 Apr 2012 07:17:55 +0000 (09:17 +0200)]
Use local context to get messages
Change-Id: I603cd41002a4fade09a940133d9fc9ce15a4431d
Santhosh Thottingal [Mon, 2 Apr 2012 13:01:10 +0000 (18:31 +0530)]
(bug 33658) support for {{GRAMMAR:}} in jqueryMsg
This add GRAMMAR support to the mediawiki.jqueryMsg module:
1. make jqueryMsg understand GRAMMAR(case insensitive)
2. mw.language get convertGrammar, can be overridden per language as in
php
3. Introduce resourceloader module ResourceLoaderLanguageDataModule
4. Language.php get a method to filter wgGrammerForms for the current
contentLanguage.
5. Qunit tests
6. This code was originally written in jsgrammar branch of svn and had
reviewed during the last slush time.
Change-Id: I90dd0b2f0cb30fd30539896c292829adc4fc7364
tstarling [Tue, 10 Apr 2012 00:36:30 +0000 (10:36 +1000)]
Remove request_with_session/request_without_session
Remove wfIncrStats() calls for request_with_session and
request_without_session. These cause a high load on the profiler and are
not currently needed for performance analysis.
Change-Id: I0ed1e87574c7c9eeaee4e503db86b862ff0995bb
Demon [Mon, 9 Apr 2012 23:05:10 +0000 (19:05 -0400)]
Fix tabbing
- As requested at <http://www.mediawiki.org/wiki/Special:Code/MediaWiki/114554>
- Also add some braces
Change-Id: I0c9cb7c50b9eb41f0a5cb6d2902e7b74cbe9d2bf
Catrope [Mon, 9 Apr 2012 22:25:23 +0000 (22:25 +0000)]
Merge "[LanguageConverter] Added some cache code based on the problems in r97512."
umherirrender [Sat, 7 Apr 2012 12:40:01 +0000 (14:40 +0200)]
(bug 33564) transwiki import sometimes result in invalid title
This is a simple fix. A other solution is to check isExternal on the
original title, but than it is never possible to import pages, which
have a interwiki in the destination wiki. Now the interwiki is skipped,
when using a target namespace.
Change-Id: I148e124016cacac0e0c6c6eb8c7e8a2e85802565
jarry1250 [Mon, 9 Apr 2012 18:33:28 +0000 (19:33 +0100)]
Resolve bug #18704 ("Add an unique CSS class or ID to the tagfilter table row at RecentChanges")
Effectively followup previous attempts which suffered from incorrect
placement of brackets (SVN r111186, Git r3659)
Change-Id: Ie52be2c3c92e5e89896ac063acfc95b15f77533a
Brion VIBBER [Mon, 9 Apr 2012 18:23:51 +0000 (18:23 +0000)]
Merge "(bug 35658) make mw.Uri handle uris w/o protocol or host"
Mark A. Hershberger [Mon, 9 Apr 2012 15:07:34 +0000 (11:07 -0400)]
Bug 35601 — Watchlist doesn't show or count pages not in the main
namespace when deleting them from the watchlist
Fix with array_merge.
Change-Id: I8055467a018f6eee6d55419576648e5a5fac0632
Brion VIBBER [Mon, 9 Apr 2012 17:58:14 +0000 (17:58 +0000)]
Merge "GENDER should use the GenderCache"
Aaron Schulz [Mon, 9 Apr 2012 17:53:20 +0000 (17:53 +0000)]
Merge "(bug 32498) Allow comparing pages using pageids"
Aaron Schulz [Mon, 9 Apr 2012 17:38:27 +0000 (17:38 +0000)]
Merge "parent::report() returns nothing, so don't attempt to return its value"
Aaron Schulz [Mon, 9 Apr 2012 17:37:05 +0000 (17:37 +0000)]
Merge "Export::dumpFrom() doesn't return any values, and hence neither do any of the methods calling it (return $this->dumpFrom)"
Brion VIBBER [Mon, 9 Apr 2012 17:36:29 +0000 (17:36 +0000)]
Merge "(bug 35069) Keep history line from ending ' . . '"
umherirrender [Sat, 7 Apr 2012 15:08:34 +0000 (17:08 +0200)]
Use Linker::userToolLinks on Special:ListUsers to format the rows in
the same way as Special:ActiveUsers.
Move the LinkBatch to method doBatchLookups and add NS_USER_TALK to load
the user talk state (talk link added in r111180 manually, now added with
Linker::userToolLinks).
Change-Id: I88f126cf4ef263a5ce13cd1fee256a43e44b148d
Brion VIBBER [Mon, 9 Apr 2012 17:27:30 +0000 (17:27 +0000)]
Merge "Check that the result of Title::makeTitleSafe() is an object before calling a method on it."
Brion VIBBER [Mon, 9 Apr 2012 16:33:12 +0000 (16:33 +0000)]
Merge "Fix for chunked uploading support in API."
Reedy [Mon, 9 Apr 2012 14:51:00 +0000 (14:51 +0000)]
Merge "Document $mDb"
Alexandre Emsenhuber [Mon, 9 Apr 2012 08:30:50 +0000 (10:30 +0200)]
Check that the result of Title::makeTitleSafe() is an object before calling a method on it.
Change-Id: If23fb3a5900cee6a5c4b3c24b44ce7f3da308bf3
Title::makeTitleSafe() does not always return a Title object, e.g. calling load.php?modules=user&user=| resulted in a fatal error.
Hashar [Mon, 9 Apr 2012 07:08:39 +0000 (07:08 +0000)]
Merge "Fix documentation to match potential code"
Erik Moeller [Sun, 8 Apr 2012 11:27:32 +0000 (04:27 -0700)]
Fix for chunked uploading support in API.
Chunked uploading is currently only implemented by Upload Wizard,
but is supported in MediaWiki core. It's enabled in Upload Wizard
by setting $wgUploadWizardConfig['enableChunked'] to true.
When enabled, large files will be split into smaller chunks, by
default of 1 MB. This is done through a series of API POST
requests. The file is identified by means of a 'filekey' to
allow for continuation of uploads from previous offsets.
Previously broken behavior: Files were concatenated correctly,
but instead of the whole file, one of the chunks was uploaded
to the wiki. This was due to the API using the filekey of the
chunk, as opposed to the filekey of the whole file.
In addition, this change also cleans out the stash information
for both filekeys after the upload is complete.
[Patch set 2: Whitespace fix]
[Patch set 3: Move filekey result past status check]
Change-Id: Idac94e953676787f9516051e47c006525f198fd4
Kevin Israel [Sun, 8 Apr 2012 20:58:39 +0000 (16:58 -0400)]
(bug 35069) Keep history line from ending ' . . '
The portion of the history line after the character difference is now
added immediately before running PageHistoryLineEnding hooks, allowing
the omission of the ' . . ' separator if it would not actually separate
anything but rather remain at the line's end.
Patchset2: Added corresponding release note.
Change-Id: If6458bedb7492b15ece14f5eebbb697b93905a44
Aaron Schulz [Sun, 8 Apr 2012 05:57:02 +0000 (05:57 +0000)]
Merge "setGroup doesn't return anything, so don't try and return its value"
Aaron Schulz [Sat, 7 Apr 2012 23:58:27 +0000 (23:58 +0000)]
Merge "Action::checkCanExecute doesn't return anything on success, but WatchAction returns the result"
Aaron Schulz [Sat, 7 Apr 2012 23:56:30 +0000 (23:56 +0000)]
Merge "Fix assignment in conditional"
Reedy [Sat, 7 Apr 2012 19:19:28 +0000 (20:19 +0100)]
Fix assignment in conditional
Change-Id: I11e280daa4df6623a03892a59f9f7236dd4c98af
Aaron Schulz [Sat, 7 Apr 2012 23:51:48 +0000 (23:51 +0000)]
Merge "A set method doesn't need to return anything (and besides, niether does $this->base->setSessionData())"
Aaron Schulz [Sat, 7 Apr 2012 23:48:59 +0000 (23:48 +0000)]
Merge "Document StringUtils"
Aaron Schulz [Sat, 7 Apr 2012 23:46:29 +0000 (23:46 +0000)]
Merge "Document spawn* class variables"
Aaron Schulz [Sat, 7 Apr 2012 23:45:47 +0000 (23:45 +0000)]
Merge "$rootCode isn't used so no point creating it"
Aaron Schulz [Sat, 7 Apr 2012 23:45:01 +0000 (23:45 +0000)]
Merge "Fix convIPTC docs"
Aaron Schulz [Sat, 7 Apr 2012 23:38:22 +0000 (23:38 +0000)]
Merge "wfLocalFile returns a LocalFile (or null) not a File"
Aaron Schulz [Sat, 7 Apr 2012 23:37:32 +0000 (23:37 +0000)]
Merge "Fix variable collision"
Aaron Schulz [Sat, 7 Apr 2012 23:34:41 +0000 (23:34 +0000)]
Merge "Fix repo type of a LocalFile to be LocalRepo, which has a cleanupDeletedBatch which returns a value"
Aaron Schulz [Sat, 7 Apr 2012 23:33:14 +0000 (23:33 +0000)]
Merge "Fix duplicate array key of fa_deleted in LocalFile"
Alex Monk [Sat, 7 Apr 2012 23:30:54 +0000 (00:30 +0100)]
(bug 32498) Allow comparing pages using pageids
Change-Id: Ia2ab39e3b7b911f622aad96ca7b94ea7675c00ac
Reedy [Sat, 7 Apr 2012 21:30:24 +0000 (21:30 +0000)]
Merge "(bug 32497) API now allows changing of protection level using pageid"
Reedy [Sat, 7 Apr 2012 21:07:32 +0000 (22:07 +0100)]
Document $mDb
Change-Id: I971820ba14d08f23c2eec570183ab851e48debfc
Reedy [Sat, 7 Apr 2012 21:02:09 +0000 (22:02 +0100)]
Document spawn* class variables
Change-Id: I9e80b5b41ca442c8671d65cce4e8d2f5c033435d
Nikerabbit [Sat, 7 Apr 2012 21:01:51 +0000 (21:01 +0000)]
Merge "Make $procOpenResource protected as it's used on line 1011 in the Dump7ZipOutput subclass"