shirayuki [Tue, 5 Mar 2013 10:52:00 +0000 (19:52 +0900)]
Changing position of colon for consistency
Change-Id: I54f5877dbd2f28726998b7ccec4ae5cad517ab68
jenkins-bot [Tue, 5 Mar 2013 01:40:43 +0000 (01:40 +0000)]
Merge "Fix checkstyle issues in JavaScript."
Matthew Flaschen [Mon, 4 Mar 2013 23:37:11 +0000 (15:37 -0800)]
Fix checkstyle issues in JavaScript.
Change-Id: I22ad0fb99a5895d1a16c5a89194356d906d42eaf
Timo Tijhof [Mon, 4 Mar 2013 23:53:16 +0000 (00:53 +0100)]
Gitignore: Clean up and ensure /includes/cache is not ignored.
In Git (at least in version 1.8.x) entries without leading slash
can be matches in any subdirectory.
Add a / in front of all those that should only be in the root.
Change-Id: I61e2be30ac24c5b369a1d36869fbd027f197bebf
Translation updater bot [Mon, 4 Mar 2013 21:39:44 +0000 (21:39 +0000)]
Merge "Localisation updates from translatewiki.net."
jenkins-bot [Mon, 4 Mar 2013 21:32:04 +0000 (21:32 +0000)]
Merge "Added --postime option syncFileBackend."
Translation updater bot [Mon, 4 Mar 2013 21:17:21 +0000 (21:17 +0000)]
Localisation updates from translatewiki.net.
Change-Id: Ib88f09f813a596f0cc418624f86b748a4a2db40e
umherirrender [Sat, 17 Nov 2012 20:41:33 +0000 (21:41 +0100)]
Add username for GENDER in LogFormatter only when visible
For sanity.
bug:42621
Change-Id: If133597f06edcfdda4ad7a47506635743c80cd53
jenkins-bot [Mon, 4 Mar 2013 19:43:11 +0000 (19:43 +0000)]
Merge "(Bug 45355) Read of arbitrary files through mwdoc-filter.php"
Alex Monk [Sun, 30 Dec 2012 13:59:48 +0000 (13:59 +0000)]
(bug 43518) API action=unblock should return the user name, not the full user object
Change-Id: I830e210122a6608b4b599bb0b59c1c99b073c06d
Reedy [Mon, 4 Mar 2013 18:38:35 +0000 (18:38 +0000)]
Revert "Creating new WMF 1.21wmf11 branch"
This reverts commit
4a5fa0c4246adf52cd9351d82f4917aec19b7a92.
Change-Id: I0c9d813b0e82f399ab815007452a8cc6c9dde145
Reedy [Mon, 4 Mar 2013 18:38:22 +0000 (18:38 +0000)]
Revert "Commit of various live hacks"
This reverts commit
3d6851f66257d5df117688b51b7f3037c8ab6aaf.
Change-Id: I26c418d631047783ba945e6b6a7f707d876b3146
Reedy [Mon, 4 Mar 2013 18:38:05 +0000 (18:38 +0000)]
Revert "Applied patches to new WMF 1.21wmf11 branch"
This reverts commit
855d049c75fe303a7a0fcb06dba60170437a694d.
Change-Id: I68f75d9e9cb942f6dc4bdef97a5d5458c9b89875
Reedy [Mon, 4 Mar 2013 18:34:21 +0000 (18:34 +0000)]
Revert "Update WikiData extensions to correct points for 1.21wmf11"
This reverts commit
dd9a9650eb7bd975577b2dbc7854a2c7010c424a
Change-Id: I9526696616c7f1d941cc02fb8b5749d36cc9022c
Reedy [Mon, 4 Mar 2013 18:20:39 +0000 (18:20 +0000)]
Update WikiData extensions to correct points for 1.21wmf11
Change-Id: I55645efb152388d6c84c2afaba270d049a1711f9
Reedy [Mon, 4 Mar 2013 18:03:40 +0000 (18:03 +0000)]
Applied patches to new WMF 1.21wmf11 branch
Reedy [Tue, 10 Apr 2012 18:27:59 +0000 (18:27 +0000)]
Commit of various live hacks
Disable of MessageBlobStore clear
Reset $wgAutopromote (should be moved to a config change!!)
Disable setting of wgStyleSheetPath
Throttle page_touched
Add apc htcp packet numbers to SquidUpdate
Disable set names binary/utf8
Commment out searchindex table indexes
Was
c532e81d583d3d0439fe76eea4d105d675461b56
Original revision Change-Id I42c4f859e55eb198f6c6841e582b3552aad7b31f
https://gerrit.wikimedia.org/r/#/c/7606
Change-Id: I5ec8dd53188e9e4128f99ceaff38ebf9dcf570bb
Reedy [Mon, 4 Mar 2013 18:03:36 +0000 (18:03 +0000)]
Creating new WMF 1.21wmf11 branch
umherirrender [Sat, 2 Mar 2013 16:50:56 +0000 (17:50 +0100)]
Change intval( User::getOption() ) to User::getIntOption()
Also changed some getOption with int or bool cast
Change-Id: Ia551a50e9de047c62be84065481fdf8c02e2ef96
jenkins-bot [Mon, 4 Mar 2013 13:03:58 +0000 (13:03 +0000)]
Merge "Remove Lithuanian override of plural rules"
Santhosh Thottingal [Mon, 4 Mar 2013 12:39:22 +0000 (18:09 +0530)]
Remove Lithuanian override of plural rules
Same rules defined in CLDR plural rules
Change-Id: I2420720fe7dc42bb196bdd442839e41bf7b7c766
Santhosh Thottingal [Mon, 4 Mar 2013 11:19:02 +0000 (16:49 +0530)]
Remove custom Latvian(lv) language plural rules
CLDR is now in sync with MW plural rules. So no need of custom plural logic
Change-Id: I399f99ddd40eea67e981d5710658ba635f115a31
Siebrand Mazeland [Mon, 4 Mar 2013 08:36:28 +0000 (09:36 +0100)]
Use American English spelling for labor
Spotted by Shirayuki in
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Exif-iimcategory-lab/en
Change-Id: I27c2d9bdef4574f3007126ae288c28c0c2783247
Brad Jorsch [Wed, 23 Jan 2013 20:40:57 +0000 (15:40 -0500)]
(bug 44244) Add number of watchers to API prop=info
Following up I1cb6ee22, which added this information to each page's
action=info, this adds inprop=watchers to query the number of people
watching the page. It is subject to the same limitations (user has
unwatchedpages or watchers >= $wgUnwatchedPageThreshold) as action=info.
Also, update doc for $wgUnwatchedPageThreshold to match reality.
Bug: 44244
Change-Id: Ideaac1d84bbe0349154ffe96ba54d74305e3da1d
jenkins-bot [Mon, 4 Mar 2013 00:38:50 +0000 (00:38 +0000)]
Merge "(bug 45633) Fix more occurences of "e-mail" to "email" in API"
Marius Hoch [Sun, 3 Mar 2013 23:55:52 +0000 (00:55 +0100)]
Restoring languages/messages/MessagesAr.php (blanked by L10n-bot)
This broke in I395bdf8a39867f58f84991dd356fbfe975394ff7
Change-Id: I3b4a251c0e62333d0d92b313f483a015cb29c2e4
Translation updater bot [Sun, 3 Mar 2013 20:19:26 +0000 (20:19 +0000)]
Localisation updates from translatewiki.net.
Change-Id: I395bdf8a39867f58f84991dd356fbfe975394ff7
jenkins-bot [Sun, 3 Mar 2013 19:38:51 +0000 (19:38 +0000)]
Merge "cleanup action=tokens"
Alexandre Emsenhuber [Sun, 3 Mar 2013 17:45:53 +0000 (18:45 +0100)]
(bug 45633) Fix more occurences of "e-mail" to "email" in API
- Missed item in ApiSetNotificationTimestamp.php
- Update link to mediawiki.org in ApiEmailUser.php now that the
page was renamed
Bug: 45633
Change-Id: I2a0a41317b9671fcd5fa1f9301cd67e619926a3e
Aaron Schulz [Sun, 3 Mar 2013 12:45:15 +0000 (04:45 -0800)]
Added --postime option syncFileBackend.
* Useful when starting positions are made after copying started.
Change-Id: I34d996594753f7bc4449dac96a4822242c1897ee
Matthew Flaschen [Sun, 3 Mar 2013 03:13:05 +0000 (22:13 -0500)]
(bug 43270) Ensure wgPostEdit can never be set on a non-view.
Change-Id: I9e6aac9b25016b804e2be5e4810ae91851cca265
jenkins-bot [Sun, 3 Mar 2013 00:44:44 +0000 (00:44 +0000)]
Merge "Use 'email' instead of 'e-mail' in English installer messages"
jenkins-bot [Sun, 3 Mar 2013 00:42:48 +0000 (00:42 +0000)]
Merge "Use 'email' instead of 'e-mail' in API texts."
Brad Jorsch [Tue, 26 Feb 2013 21:45:37 +0000 (13:45 -0800)]
Add "upload" type to API
If a file upload is not formatted correctly for PHP to recognize it as a
file upload rather than a regular field, the API will wind up trying to
load the file contents as a text field. Since these file contents are
often a large binary file, this will tend to run out of memory trying to
apply Unicode normalization.
To prevent this and to allow for a helpful error message, mark
parameters that are supposed to be file uploads.
Bug: 44909
Change-Id: Ia4586953e2ad2d72d08852689e060e39e7920d50
Translation updater bot [Sat, 2 Mar 2013 19:59:04 +0000 (19:59 +0000)]
Localisation updates from translatewiki.net.
Change-Id: Ia3a49cfe8c44cf4d9adee5fbc891b4b72de48269
Matthew Flaschen [Sat, 2 Mar 2013 05:03:19 +0000 (00:03 -0500)]
mw.loader: Prevent useless jobs from being added to queue
* load was calling request with ready and error being null.
* request was doing a strict check against undefined to prevent adding
jobs with no callbacks to the queue.
* Since these were null rather than undefined, the empty jobs got added
anyway. Now using undefined instead.
* Mark ready and error as optional in the request JS documentation.
Change-Id: I6428e733899f7c484f842f6fe142c8d4d49ee443
Alex Monk [Sat, 2 Mar 2013 18:34:38 +0000 (18:34 +0000)]
Use 'email' instead of 'e-mail' in English installer messages
Bug: 45461
Change-Id: I8ac71f3bd8c017f57d66bee58437d9a62fe16cd2
Alex Monk [Sat, 2 Mar 2013 18:13:54 +0000 (18:13 +0000)]
Use 'email' instead of 'e-mail' in API texts.
Bug: 45633
Change-Id: Ieddc066be4051a20f0500b52e6b021e877d6c97d
Yuri Astrakhan [Sat, 2 Mar 2013 00:06:46 +0000 (19:06 -0500)]
API continue param to streamline iteration of complex queries
Greatly simplifies query result iteration by the clients
by providing a mechanism to track sub-iterations (props in generated set)
Assuming the client has the param=>value dictionary with the original request
parameters, client will only need to perform this operation in their language
to get all results from the server regardless of what query they make.
$request = array_merge( $request, $result['continue'] );
Related changes:
* Moved dieContinueUsageIf() from ApiQueryBase to ApiBase
* Internal calls will also return unused param warnings
* Reworked query unit tests for easier testing
Change-Id: Ieb45241fc6db2109f1d92fa3381165ec30701b63
jenkins-bot [Fri, 1 Mar 2013 23:11:06 +0000 (23:11 +0000)]
Merge "testInvalidEmail() passes now without local config"
jenkins-bot [Fri, 1 Mar 2013 23:02:27 +0000 (23:02 +0000)]
Merge "[FileBackend] Process cache negatives for file SHA1 function."
Translation updater bot [Fri, 1 Mar 2013 22:10:54 +0000 (22:10 +0000)]
Merge "Localisation updates from translatewiki.net."
jenkins-bot [Fri, 1 Mar 2013 22:00:46 +0000 (22:00 +0000)]
Merge "Remove DB2 support"
Platonides [Sat, 9 Feb 2013 18:57:03 +0000 (19:57 +0100)]
testInvalidEmail() passes now without local config
ApiAccountCreationTest::testInvalidEmail() no longer
needs LocalSettings to have $wgEnableEmail = true;
Change-Id: I97803be116fda8194e46fe0021c7b32d7b703b1d
jenkins-bot [Fri, 1 Mar 2013 21:37:32 +0000 (21:37 +0000)]
Merge "Bug 35623 - createAndPromote.php: Change to allow promotion only"
jenkins-bot [Fri, 1 Mar 2013 21:26:21 +0000 (21:26 +0000)]
Merge "Improve documentation for OutputPage->addModuleStyles"
jenkins-bot [Fri, 1 Mar 2013 21:05:14 +0000 (21:05 +0000)]
Merge "Kill off and remove HttpRequest class"
Translation updater bot [Fri, 1 Mar 2013 20:30:29 +0000 (20:30 +0000)]
Localisation updates from translatewiki.net.
Change-Id: I10ba9add99316e9b144308d3ba20637e31c327b4
GWicke [Fri, 1 Mar 2013 19:06:03 +0000 (19:06 +0000)]
Merge "More tests for Parsoid's beneift."
jenkins-bot [Fri, 1 Mar 2013 18:56:21 +0000 (18:56 +0000)]
Merge "(Bug 44192) Do not attempt to send a real e-mail"
Subramanya Sastry [Fri, 1 Mar 2013 00:33:01 +0000 (18:33 -0600)]
More tests for Parsoid's beneift.
* One more wikitable fostered content test for this:
https://gerrit.wikimedia.org/r/#/c/51170/
* Merged duplicate extlink test with another.
* Added another extlink text that tests RTing of space-separated
link-text.
Change-Id: I4307bde61b186734f3706dc8940f47e015ec2bc5
jenkins-bot [Fri, 1 Mar 2013 17:55:02 +0000 (17:55 +0000)]
Merge "API: Throw error when interwiki is given for various title param"
umherirrender [Fri, 1 Mar 2013 15:01:26 +0000 (16:01 +0100)]
API: Throw error when interwiki is given for various title param
See bug 44341 for action=parse, but the problem with interwiki
processing can also be happen in other modules.
This gives clearer error message on some modules
For example action=move:
Bad title "*title*"
instead of:
Unknown error: "immobile-target-namespace-iw"
Change-Id: I86524533dfd778a169b39968999918a1f531efeb
Alexandre Emsenhuber [Fri, 1 Mar 2013 07:22:46 +0000 (08:22 +0100)]
Correct documentation for wfPickRandom()'s return types
Also make LoadBalancer::pickRandom()'s one consistent.
Change-Id: Ib80827ef20b32fecb799f327545b1232272076d2
Bsitu [Fri, 1 Mar 2013 02:04:46 +0000 (02:04 +0000)]
Merge "Removing badge drop shadow per Vibha"
C. Scott Ananian [Sat, 23 Feb 2013 04:26:08 +0000 (23:26 -0500)]
Add 'parsoid' option to parserTests.txt.
Rather than overload the 'disabled' option, explicitly mark Parsoid-only
parser tests with "parsoid" in the options field. These are disabled
by default when the PHP parser tests are run (but you could explicitly
enable them with --run-parsoid if you wished, in the same way that you
can enable other disabled tests with --run-disabled).
Document the 'php' option, which the PHP parser tests will ignore, but
will (in the future) be used to mark php-only tests which should be
ignored by the Parsoid parser.
Tweaked 'disabled' option to 'parsoid' for those tests which explicitly
call themselves parsoid-only. I was conservative in this patch; if
the title of the test didn't explicitly mention Parsoid, I left the
test disabled rather than switch it to parsoid.
Change-Id: Id6c396f7966fcb21c1e54e222ab0c9f4e3a34dcc
MarkTraceur [Fri, 1 Mar 2013 00:30:55 +0000 (00:30 +0000)]
Merge "Some additional test cases for Parsoid."
C. Scott Ananian [Sat, 23 Feb 2013 03:38:36 +0000 (22:38 -0500)]
Some additional test cases for Parsoid.
1) "border" attribute can be used in addition to "framed" / "frameless"
on images.
2) parsoid no longer adds semicolons to style attributes where they don't
exist in the source.
3) empty table rows are elided by the PHP parser. (Parsoid doesn't do
this yet.)
4) Italicized possessive (unmatched single-quote). (Parsoid currently
misparses this.)
5) Tests for localized Image handling; check that localized image
options are handled correctly.
Change-Id: I9771374ff167df39535ec99c5f292f739eab8fe7
Platonides [Thu, 28 Feb 2013 22:16:29 +0000 (14:16 -0800)]
(Bug 44192) Do not attempt to send a real e-mail
The ApiAccountCreationTest is attempting to send an email to the newly
created user. The tests should really never send any email. This patch
register a noop callback for the 'AlternateUserMailer' hook which would
disable email entirely in our test suite.
This is generic version of
2025a89 which was only disabling mail for the
ApiAccountCreationTest test and that Antoine reverted.
Change-Id: I7b3ba4f7563a5818c988d6f8da165cc3c984f160
Hashar [Mon, 18 Feb 2013 11:54:35 +0000 (11:54 +0000)]
Revert "(Bug 44192) Do not attempt to send a real e-mail in ApiAccountCreationTest"
This need to be made a global feature that will be applied to any test.
This reverts commit
2025a89d5bcc513826428529ed191aa781942419
Change-Id: Ia7165b78b4f80738ed9b769319e159cd86fc7bdf
jenkins-bot [Thu, 28 Feb 2013 21:48:14 +0000 (21:48 +0000)]
Merge "Preserve caller expectations for behaviour of sslVerifyHost"
Translation updater bot [Thu, 28 Feb 2013 21:31:39 +0000 (21:31 +0000)]
Merge "Localisation updates from translatewiki.net."
jenkins-bot [Thu, 28 Feb 2013 21:09:49 +0000 (21:09 +0000)]
Merge "Move LoadBalancer::pickRandom() to wfPickRandom()"
Reedy [Thu, 28 Feb 2013 01:22:49 +0000 (01:22 +0000)]
Move LoadBalancer::pickRandom() to wfPickRandom()
Code is copypaste reused in other extensions
Change-Id: I4c677ddc01ee264f3b72bb17135972adc96144ae
jenkins-bot [Thu, 28 Feb 2013 20:42:15 +0000 (20:42 +0000)]
Merge "Several minor fixes."
Translation updater bot [Thu, 28 Feb 2013 20:16:57 +0000 (20:16 +0000)]
Localisation updates from translatewiki.net.
Change-Id: I48a5f8e947e6d18e1bf8d3c9e66eaae4657af110
Platonides [Thu, 28 Feb 2013 19:56:05 +0000 (20:56 +0100)]
Several minor fixes.
- Add missing wfProfileOut( __METHOD__ ); in FSFile.php [
13ae6bfb]
- Remove unused $IP globals in ApiUpload.php [
fbf34d84]
- Remove empty statement in EditPage.php [
375687ed]
Change-Id: I3b0506e3c8fc89b352a0d72f18e51a1223af0e9b
jenkins-bot [Thu, 28 Feb 2013 20:03:53 +0000 (20:03 +0000)]
Merge "Add a define guard to NoLocalSettings.php"
jenkins-bot [Thu, 28 Feb 2013 18:04:20 +0000 (18:04 +0000)]
Merge "Only run sha1_file once per file in FSFile"
Tim Starling [Thu, 28 Feb 2013 01:58:52 +0000 (17:58 -0800)]
Preserve caller expectations for behaviour of sslVerifyHost
(bug 42441) The previous patch unnecessarily broke backwards
compatibility in the Http::request() API, following cURL's broken
conventions for sslVerifyHost instead of the boolean interpretation
expected by all existing callers. This change reverts that one, and
fixes the bug in another way. See Ia6535f10.
Also don't bother wrapping the $this->sslVerifyHost access with isset()
since it's always set.
Change-Id: Ia4e1689249b6ac515b859ea2eca1dcff3e63098c
Reedy [Thu, 28 Feb 2013 01:45:54 +0000 (01:45 +0000)]
Kill off and remove HttpRequest class
Change-Id: I0661d483c60fc0d32f0c51937e91bece6960dfcf
Marius Hoch [Thu, 28 Feb 2013 00:40:26 +0000 (01:40 +0100)]
Make UploadBase::getTempFileSha1Base36 public
There's no obvious reason for this method to be private while
it's pretty handy to have it in hooks.
Change-Id: If716665a939e8fe84288354ee8c16369604b67fb
Marius Hoch [Thu, 28 Feb 2013 00:11:12 +0000 (01:11 +0100)]
Only run sha1_file once per file in FSFile
This shouldn't harm as we don't use this and then alter the file.
But it can kick in useful with extension that need the sha1 of
files (like AbuseFilter).
Change-Id: Ied2ac0397266a5ffd27da02ef6448b64c12fad86
Kaldari [Wed, 27 Feb 2013 23:56:17 +0000 (15:56 -0800)]
Removing badge drop shadow per Vibha
Change-Id: I14896cd9e422f16df860fb8b6c935f93eb0ad188
Translation updater bot [Wed, 27 Feb 2013 21:38:28 +0000 (21:38 +0000)]
Merge "Localisation updates from translatewiki.net."
ASchulz [Wed, 27 Feb 2013 01:01:41 +0000 (17:01 -0800)]
Deal with garbage user_token values in the DB.
Change-Id: I92f1645d4a1cfc4151bd34b566ec3ac05eab427f
Translation updater bot [Wed, 27 Feb 2013 20:25:02 +0000 (20:25 +0000)]
Localisation updates from translatewiki.net.
Change-Id: I69a9134b49d49f5755d0e4c291de7780b9ab8ac7
Kaldari [Wed, 27 Feb 2013 19:08:40 +0000 (19:08 +0000)]
Merge "Change new wgUserRegistration format, put in User:"
umherirrender [Wed, 27 Feb 2013 18:36:25 +0000 (19:36 +0100)]
Do not read /.git if it is a directory
On my windows under eclipse with EGit there is a directory named .git,
but that gives warning, when read with file_get_contents:
Warning: file_get_contents(/.git) [function.file-get-contents]: failed
to open stream: Permission denied in \includes\GitInfo.php on line 49
Follow up Ieb79c0b4
Change-Id: I7c3ba323460a2fd3739d3912ee6420aa29311f4f
Platonides [Tue, 26 Feb 2013 21:41:39 +0000 (22:41 +0100)]
Remove unused global $wgMemc
Rename $type so it's not unused
Change-Id: If74c659a4ae507d8d59fe4d17e77f13f5e646c95
ASchulz [Wed, 27 Feb 2013 00:17:58 +0000 (16:17 -0800)]
Init the user token before adding users.
* The DB column has garbage padding as the default value, which
was intented to just be "". Since the the insert functions cast
the value to a string, inserting a user without creating a token
causes garbage to be inserted. The logic to automatically fix
empty tokens does not trigger. This fixes createNew() to set the
token and makes sure that addToDatabase() does.
Change-Id: I3529fe8afbc62bac37063217d5aa0179a4a6e169
Siebrand Mazeland [Wed, 27 Feb 2013 10:28:26 +0000 (11:28 +0100)]
(bug 45461) Use email instead of e-mail
Change-Id: Iae47a24127b4bdd4ef308bdbd5be865217eb14f1
Siebrand Mazeland [Wed, 27 Feb 2013 10:13:57 +0000 (11:13 +0100)]
Consistency fixes
Spotted by Shirayuki.
Change-Id: I0e016caacaa7c1f00c966cc50eaa2f6982085e5b
Reedy [Wed, 27 Feb 2013 09:15:43 +0000 (09:15 +0000)]
Add missing parameter in handleWriteError call
Change-Id: If3ebf6f77d66121bac8e11d43582f1dbb3e88e12
Niklas Laxström [Wed, 27 Feb 2013 08:56:06 +0000 (08:56 +0000)]
Docs, typofix, additional testcase for I7be51e
Change-Id: I0ab17cb749c23b666e0bb1ee61fe7d424e717fde
Matthew Flaschen [Wed, 27 Feb 2013 06:09:26 +0000 (01:09 -0500)]
Improve documentation for OutputPage->addModuleStyles
Change-Id: I56392cdb4e0d9fd5cac15ac947962364ae96381f
umherirrender [Tue, 26 Feb 2013 20:16:46 +0000 (21:16 +0100)]
Added missing @deprecated doc to File and Title
Change-Id: I32bd054e97905a5a763e47daecf4be615981a3ff
Matthew Flaschen [Wed, 27 Feb 2013 02:32:19 +0000 (21:32 -0500)]
Change new wgUserRegistration format, put in User:
* This is much more useful if it can be passed to new Date. As a side
effect, this means straight arithmetic comparisons can be done.
* Add a method for this to mediawiki.user (getRegistrationDate).
* Improve docs on server User::getRegistration method by documenting possibility that data is null.
Change-Id: Id7ae0faa930433876939b73d47fc294975e14fb1
jenkins-bot [Wed, 27 Feb 2013 04:02:35 +0000 (04:02 +0000)]
Merge "Make maintenance/update.php parse again under PHP 4.1.0"
Kaldari [Wed, 27 Feb 2013 02:14:52 +0000 (02:14 +0000)]
Merge "Expose additional user attributes as JS vars"
Ori Livneh [Tue, 22 Jan 2013 22:44:22 +0000 (14:44 -0800)]
Expose additional user attributes as JS vars
This change adds user ID, registration time, and edit count to the
default set of JavaScript configuration variables.
These values are all included in $mCacheVars and so require no additional
database lookups.
Change-Id: Id0adb795567d4ba932104938f2793cdb4084883c
Brad Jorsch [Tue, 26 Feb 2013 23:19:52 +0000 (15:19 -0800)]
(bug 44923) Fix API upload with only one chunk
The API supports chunked uploads to upload a file in multiple pieces.
But it doesn't check if the the entire file is uploaded in the first
chunk, so it winds up waiting for a subsequent chunk that can never
come.
It's actually fairly easy to fix, we just need to move the check for
"did we get the entire file?" outside of the "if we're getting a chunk
after the first" check.
Change-Id: I915c1678dfa3107f1739fed8613ab9452139b946
jenkins-bot [Wed, 27 Feb 2013 00:04:21 +0000 (00:04 +0000)]
Merge "Fix UploadStash::removeFile() error"
jenkins-bot [Tue, 26 Feb 2013 23:58:32 +0000 (23:58 +0000)]
Merge "[Upload] Moved async upload stuff to the job queue."
Brad Jorsch [Tue, 26 Feb 2013 23:15:17 +0000 (15:15 -0800)]
Fix UploadStash::removeFile() error
If nothing has called getFile() for a key before that key is passed to
removeFileNoAuth(), UploadStash will throw a fatal error when it tries to
remove the file from the filesystem because the UploadStashFile was
never created.
Change-Id: Idf0d2c53ce759b59836f34ff5aaad393b8c371c6
MatmaRex [Tue, 26 Feb 2013 21:13:51 +0000 (22:13 +0100)]
Revert "(bug 29788) Swedish Collation (uppercase-sv). Swaps Ä and Æ"
This workaround is unnecessary now that I838484b9 was merged.
This reverts commit
13dc8ff88f48e0bb18750f5e98d50cdb8057c0d3.
Change-Id: I2cd22ad87eb7a56c5742b20c6089a4b8607e5614
jenkins-bot [Tue, 26 Feb 2013 21:34:35 +0000 (21:34 +0000)]
Merge "(bug 44921) API should properly handle OPTIONS"
Translation updater bot [Tue, 26 Feb 2013 21:00:46 +0000 (21:00 +0000)]
Merge "Localisation updates from translatewiki.net."
Brad Jorsch [Tue, 26 Feb 2013 20:41:00 +0000 (12:41 -0800)]
(bug 44921) API should properly handle OPTIONS
When given an OPTIONS request, ApiMain should return just after the CORS
check. It should not actually execute the action or return any response
body.
Change-Id: I1c16cb89e777aaac69ae86b532d16f4c10a1f1d2
Platonides [Tue, 26 Feb 2013 20:52:23 +0000 (21:52 +0100)]
Make maintenance/update.php parse again under PHP 4.1.0
The instanceof produces a parse error on old PHP versions,
which doesn't show the old-version error message.
Note that our is minimum PHP version is 5.3.2, so it won't
produce E_STRICTs (is_a() was undeprecated in 5.3.0)
Change-Id: I5904301759bd154dd87ed90a5176369e37346482