Kunal Grover [Sun, 10 Aug 2014 01:42:46 +0000 (07:12 +0530)]
Using ULS in Special:PageLanguage
Implemented LanguageSelector hook
Change-Id: I20ead73e74fb64eeb0eae93d07b6d06a8022b1de
jenkins-bot [Wed, 9 Jul 2014 14:09:02 +0000 (14:09 +0000)]
Merge "Generate thumbnails based on buckets"
jenkins-bot [Wed, 9 Jul 2014 11:13:00 +0000 (11:13 +0000)]
Merge "mediawiki.page.gallery.resize: Remove weird mw.hook call"
jenkins-bot [Wed, 9 Jul 2014 11:00:27 +0000 (11:00 +0000)]
Merge "Move white-space: nowrap from PHP to CSS"
jenkins-bot [Wed, 9 Jul 2014 01:19:39 +0000 (01:19 +0000)]
Merge "No longer support installs where register_globals is enabled"
Skizzerz [Fri, 27 Jun 2014 01:17:05 +0000 (20:17 -0500)]
Set the default database schema to "mediawiki" so as not to break the CLI installer.
Due to changes made to support Microsoft SQL Server, $wgDBmwschema changed its default from
"mediawiki" to null in DefaultSettings.php, as anything else horribly broke every DBMS that did
not use schemas (such as MySQL and SQLite). This change makes it so that the default value can
be properly overridden again by PostgreSQL and Microsoft SQL Server, and also enables the
--dbschema flag to the CLI installer.
Bug: 64043
Change-Id: Id364306d883e0d494b948854e05f3f79ba7dd6d2
umherirrender [Sat, 28 Jun 2014 13:38:24 +0000 (15:38 +0200)]
Remove Title::updateTitleProtection() (deprecated since 1.19)
Change-Id: I7ebfa106ef72a4aa6659332210e3401bfa02cafc
umherirrender [Fri, 27 Jun 2014 14:58:36 +0000 (16:58 +0200)]
Remove OutputPage::isUserJsAllowed() (deprecated since 1.18)
Change-Id: Ib56d22f49f229cb91b938b70e386d50c1e38e927
umherirrender [Fri, 27 Jun 2014 14:57:30 +0000 (16:57 +0200)]
Remove OutputPage::getStatusMessage() (deprecated since 1.18)
Also removed a comment where the method was mentioned.
Change-Id: I802f0f41e107a1d677fb899f6e09ea31df3c4e6f
umherirrender [Wed, 25 Jun 2014 18:41:25 +0000 (20:41 +0200)]
Remove Preferences::loadOldSearchNs() (deprecated since 1.19)
Change-Id: Ia9bfafddd9a861b1ca78fc1a642981dc9535ab27
umherirrender [Wed, 25 Jun 2014 18:38:19 +0000 (20:38 +0200)]
Remove MWNamespace::isMain() (deprecated since 1.19)
Change-Id: I05dd24f9fcd911020b769d79430ce2dbeb71e6d4
jenkins-bot [Tue, 8 Jul 2014 23:31:48 +0000 (23:31 +0000)]
Merge "Add delete link to Special:Listfiles"
Kunal Mehta [Tue, 8 Jul 2014 22:46:36 +0000 (15:46 -0700)]
No longer support installs where register_globals is enabled
register_globals has been deprecated since PHP 5.3, which was released
5 years ago. There's absolutely no reason anyone should have this turned
on, and if they do, well, they probably have bigger issues than this.
Due to changes in WebStart.php, the web installer will now fail to
start, just showing an error message stating that register_globals
must be disabled beforehand.
The command-line installer will display the
"config-register-globals-error" message before exiting.
Change-Id: If951d15293c5f6aa8a92e91fefcb00f04e6c13b3
onei [Sun, 6 Jul 2014 17:19:29 +0000 (19:19 +0200)]
Add delete link to Special:Listfiles
The rationale is that the presence of a delete link can make combating
image upload vandalism substantially easier.
The change was originally added in https://github.com/Wikia/app/pull/3859
and is awaiting merger there.
Change-Id: I94b1a2d551093a4ada7aede1ad5af2a23bf86308
umherirrender [Sat, 5 Jul 2014 20:00:41 +0000 (22:00 +0200)]
Remove deprecated Skin::makeGlobalVariablesScript
And make OutputPage::getJSVars private per documentation.
Also adjust some comments.
Change-Id: Ia6484654754dd4782dda1d8c1e140cdb7a6f1115
jenkins-bot [Tue, 8 Jul 2014 21:48:21 +0000 (21:48 +0000)]
Merge "Vector: Remove backwards-compatible #bodyContent selector"
jenkins-bot [Tue, 8 Jul 2014 21:08:12 +0000 (21:08 +0000)]
Merge "Allow to set a salt for the edit token in HTMLForm"
Translation updater bot [Tue, 8 Jul 2014 21:05:34 +0000 (21:05 +0000)]
Merge "Localisation updates from https://translatewiki.net."
jenkins-bot [Tue, 8 Jul 2014 20:55:13 +0000 (20:55 +0000)]
Merge "PostgreSQL: Fix ORDER BY NULL"
Translation updater bot [Tue, 8 Jul 2014 20:49:32 +0000 (20:49 +0000)]
Localisation updates from https://translatewiki.net.
Change-Id: I55a14878cfc8edc6fe46d4d63bd428ca5218707c
Alexandre Emsenhuber [Tue, 8 Jul 2014 20:45:14 +0000 (22:45 +0200)]
Allow to set a salt for the edit token in HTMLForm
And set one in RevertAction.
Change-Id: I9f72c6203e8d9d0770009083263ddca98845f530
Jeff Janes [Tue, 8 Jul 2014 20:09:25 +0000 (13:09 -0700)]
PostgreSQL: Fix ORDER BY NULL
MySQL automatically orders by the GROUP BY columns if no ORDER BY
is specified. You can countermand this by specifying
ORDER BY NULL, which can give speed improvements in some cases,
for example if the GROUP BY was implemented by hashing then a
sort is unneeded and wastes time.
PostgreSQL does not tolerate the ORDER BY NULL syntax,
and does not need an analgous hint because it never does
gratuitious sorting of the nature just discussed.
This patch makes PostgreSQL ignore the ORDER BY NULL clause.
It might be a better approach to find a way to add this clause
specifically to MySQL, rather than to drop it specifically from
other database engines.
SQLite seems to tolerate the MySQL syntax. Oracle and MSSQL
were not evaluated.
Bug: 65794
Change-Id: Ia9666136edd25e1e0d0728a8b28a92e44d00abc6
Gilles Dubuc [Tue, 3 Jun 2014 16:09:30 +0000 (18:09 +0200)]
Generate thumbnails based on buckets
Instead of always generating thumbnails based on the original,
this adds the ability to generate thumbnails based on
references buckets. The buckets themselves have their
generation chained following the same process (smaller bucket
generated based on bigger bucket). In situations where no
suitable bucket is found, the original is used, like it used to.
This is entirely optional, as most non-WMF wikis would probably prefer
to keep generating all thumbnails based on originals.
The quality implications have been verified through a survey
aimed at Commons users and people actually preferred the chained version.
Presumably due to the multiple passes of sharpening which maintained
visual details better for small thumbnail sizes.
Change-Id: I285d56b2024c81365247338f85c1e0aa708cb21e
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/600
Bug: 67525
C. Scott Ananian [Tue, 8 Jul 2014 19:45:04 +0000 (15:45 -0400)]
Add <rtc> tag support to RELEASE-NOTES-1.24.
Bug: 67042
Change-Id: Id3eaba5de0ae56943a3defb40bc46215b66102cd
Brion VIBBER [Tue, 8 Jul 2014 19:10:53 +0000 (19:10 +0000)]
Merge "Allow HTML5 <rtc> tag (ruby support for East Asian typography)."
Gabriel Wicke [Tue, 8 Jul 2014 18:47:23 +0000 (11:47 -0700)]
Add unfloated thumb styling in Parsoid CSS
This styles
[[File:Wiki.png|thumb|none|An inline thumb]]
Parsoid sets the mw-halign-none class in this case (see
https://www.mediawiki.org/wiki/Parsoid/MediaWiki_DOM_spec#Images), and so far
we didn't have the CSS to actually act on that.
Change-Id: I5be19f144188a25dbe3f17c8745199cc0c7df70e
Fomafix [Tue, 8 Jul 2014 17:03:31 +0000 (17:03 +0000)]
Move white-space: nowrap from PHP to CSS
Change-Id: I5606c33456e70127e0b7b0a7dc8b0c59bab532f4
Ori.livneh [Tue, 8 Jul 2014 16:54:59 +0000 (16:54 +0000)]
Merge "Lowered the default OPT_READ_TIMEOUT for Redis"
Bryan Davis [Thu, 26 Jun 2014 19:05:29 +0000 (13:05 -0600)]
Fix GitInfo cache file path computation and storage location
Depending on the configuration used in LocalSettings.php, $IP can be
changed between the time that configuration is loaded and the wiki
runtime by logic in WebStart.php. Attempt to mitigate the effects of
such changes on the cache file name computation by canonicalizing both
$IP and the path using PHP's realpath() function.
Related but distinct is the possible need to configure the canonical
location for finding cache files on disk separately from
$wgCacheDirectory. This change introduces a new configuration variable
named $wgGitInfoCacheDirectory that can be set to a path that diverges
from the default location of $wgCacheDirectory/gitinfo. This will be
useful in the WMF cluster where $wgCacheDirectory points to a directory
that is not managed by the deployment system.
Finally add wfDebugLog logging to make tracking down issues such as
miscomputed cache paths easier.
Bug: 53972
Change-Id: Iceb9e1ce8d3b4bb08f89fa6ec5d5e7392aaafd46
jenkins-bot [Tue, 8 Jul 2014 15:41:35 +0000 (15:41 +0000)]
Merge "rm $wgCountTotalSearchHits. It was broken."
jenkins-bot [Tue, 8 Jul 2014 14:40:50 +0000 (14:40 +0000)]
Merge "Fix alpha transparency in XCF images"
Fomafix [Tue, 8 Jul 2014 13:18:23 +0000 (13:18 +0000)]
SpecialSearch.php: Remove inline style="margin:0em"
This is already set by
fieldset#mw-searchoptions { margin: 0; }
in mediawiki.special.search.css
Change-Id: I21effce300ab1c699b2715cc50e36b52122dc265
jenkins-bot [Tue, 8 Jul 2014 08:02:24 +0000 (08:02 +0000)]
Merge "Change name of Tahitian language"
Brian Wolff [Tue, 8 Jul 2014 06:35:56 +0000 (03:35 -0300)]
rm $wgCountTotalSearchHits. It was broken.
If $wgCountTotalSearchHits was set to true, then the total
number of hits returned was zero, which caused Special:Search
to display no results.
I'm opting to remove the feature (although I don't have any
strong opinions about removal vs changing Special:Search), since
if someone both cares about performance and has a wiki where its
big enough to matter, they are going to need to use Cirrus anyways.
Change-Id: I1c3b908ae5423ce3dfbdc22b1a68dd81a85698aa
jenkins-bot [Tue, 8 Jul 2014 04:07:50 +0000 (04:07 +0000)]
Merge "Fixed acquireForMe() bug in the redis module"
Aaron Schulz [Mon, 7 Jul 2014 03:36:24 +0000 (20:36 -0700)]
Lowered the default OPT_READ_TIMEOUT for Redis
* This should probably be low for the case of a server that is
quick to accept connections but slow to do anything.
* Made the client class handle blocking operations sanely
by automatically boosting/lowering the timeout value.
Change-Id: Idea083b843f7eb558d2daf249deea853c9ec43ae
jenkins-bot [Tue, 8 Jul 2014 03:51:13 +0000 (03:51 +0000)]
Merge "Convert CleanUpTest to use data providers"
This, that and the other [Wed, 18 Jun 2014 08:12:31 +0000 (18:12 +1000)]
Change name of Tahitian language
By request of Tahitian speakers.
Bug: 65985
Change-Id: Iec507368a37224517a960c3097d729ba2d4d6eef
Aaron Schulz [Tue, 8 Jul 2014 00:14:55 +0000 (17:14 -0700)]
Fixed acquireForMe() bug in the redis module
* Previously, blocked callers (due to no slots being open) would just timeout
instead of getting unblocked when the slot holder released the slot.
Change-Id: I67e328ca8bc1ccfb77d1ba0a753c37de3c459021
Chad Horohoe [Mon, 7 Jul 2014 23:21:09 +0000 (16:21 -0700)]
Limit test leakage, $wgCapitalLinks expected to be true
Change-Id: I0f837d29595abefaebeb67d6cc62ea48838d626a
Chad Horohoe [Mon, 7 Jul 2014 23:22:00 +0000 (16:22 -0700)]
Convert CleanUpTest to use data providers
These tests are pretty slow, and by only doing one data set
per test it extends the time they're allowed to run
Change-Id: Ia238a607ca94b96d02116ba6e3dc293c1c82a5a9
jenkins-bot [Mon, 7 Jul 2014 23:22:31 +0000 (23:22 +0000)]
Merge "Profiling: Fix StartProfiler.sample, link in docs/scripts.txt"
Matthew Flaschen [Mon, 7 Jul 2014 22:10:23 +0000 (18:10 -0400)]
Profiling: Fix StartProfiler.sample, link in docs/scripts.txt
Note two options in StartProfiler.sample, since only one of them
supports the toolbar
Change-Id: Ie8bd7febf749de8a5d32cbe87ba7733ee135bdc9
James D. Forrester [Tue, 29 Apr 2014 23:34:15 +0000 (16:34 -0700)]
Vector: Remove backwards-compatible #bodyContent selector
The selector for #bodyContent was needed for a period of 31 days after
9c8592fe was deployed (i.e., until 1 June 2014), as cache breakage
avoidance from the switch to using .mw-body-content as the selector.
Change-Id: Id3e83fa9bc6188627c0e9e2290bf8594bf4298d8
jenkins-bot [Mon, 7 Jul 2014 22:18:39 +0000 (22:18 +0000)]
Merge "Work around hhvm bug in redis job queue"
Nik Everett [Mon, 7 Jul 2014 20:17:39 +0000 (16:17 -0400)]
Work around hhvm bug in redis job queue
The hhvm redis client returns false instead of null. This caused
JobQueueRedis to get stuck in an infinite loop. This works around the
difference by catching null as a signal for no more jobs.
It can be reverted when https://github.com/facebook/hhvm/pull/3127/ is
in all versions of hhvm we expect to run MediaWiki.
Bug: 67622
Change-Id: I9bbad42f36a80635097b8e0140b48b6492b2f0f5
Matthew Flaschen [Fri, 4 Jul 2014 04:30:04 +0000 (00:30 -0400)]
mw.loader: Remove "job.error" from message for job.ready throwing
This catch block is both for exceptions thrown by 'job.ready' and
by 'job.error'.
Change-Id: Ia3aadb26824982a652663a7ebc3ba11824dd76d3
jenkins-bot [Mon, 7 Jul 2014 21:05:19 +0000 (21:05 +0000)]
Merge "Include redirect/section information in file search results"
Translation updater bot [Mon, 7 Jul 2014 20:08:38 +0000 (20:08 +0000)]
Localisation updates from https://translatewiki.net.
Change-Id: I93169218dc830f99af18036bc81382d5e760dd11
Chad Horohoe [Mon, 7 Jul 2014 20:00:45 +0000 (13:00 -0700)]
Include redirect/section information in file search results
Change-Id: I51c5ae99ab70a610a64f510b8cc522f0d9025efa
Jackmcbarn [Mon, 7 Jul 2014 19:36:44 +0000 (15:36 -0400)]
Unstub the passed object when calling unstub()
Previously, only the global was unstubbed when StubObject::unstub() was
called. Now, the object given as a parameter will also be unstubbed.
(What about other references to the object, though?)
Change-Id: I431ddd61e24686fc2f014c30064808ce57fe1706
jenkins-bot [Mon, 7 Jul 2014 16:30:24 +0000 (16:30 +0000)]
Merge "Correct deprecation warning for $.quoteString"
jenkins-bot [Mon, 7 Jul 2014 16:14:24 +0000 (16:14 +0000)]
Merge "Add tests for OutputPage::makeResourceLoaderLink()"
Kevin Israel [Mon, 7 Jul 2014 15:49:56 +0000 (11:49 -0400)]
Correct deprecation warning for $.quoteString
Follows-up
cde08292271e.
Change-Id: Ibce5d470ad96fcef8460f4759bc2bd0ccccd74ce
Translation updater bot [Sun, 6 Jul 2014 19:44:37 +0000 (19:44 +0000)]
Localisation updates from https://translatewiki.net.
Change-Id: Iafe051ad30f15eaa0379bd8d8c8a7aa2f428e864
Alexandre Emsenhuber [Sun, 6 Jul 2014 18:51:17 +0000 (20:51 +0200)]
Allow "size" attribute to HTMLSelectField
Pass this one to XmlSelect is provided.
Change-Id: I7ac345e1c219c8607895f9fc0fc2cef68c900ff8
jenkins-bot [Sun, 6 Jul 2014 18:35:25 +0000 (18:35 +0000)]
Merge "Fix RepoGroup::hasForeignRepos() and RepoGroup::forEachForeignRepo()"
jenkins-bot [Sun, 6 Jul 2014 18:32:39 +0000 (18:32 +0000)]
Merge "Do not include file redirects in Special:Wantedfiles"
Aaron Schulz [Sun, 6 Jul 2014 17:51:42 +0000 (10:51 -0700)]
Added job-undelay stat calls to the Redis queue class
Change-Id: I28f979ff6b95e09af832f8daaa6bd7bb15c2cb6b
Alexandre Emsenhuber [Sun, 6 Jul 2014 06:22:55 +0000 (08:22 +0200)]
Remove tabindex from the drop-down in Special:RevisionDelete
It is the only element in the form which has this attribute set,
so the tab order was not correct.
Bug: 67271
Change-Id: Ifa8fb91f9bf7a60e727ec7376d2bc3a851007634
umherirrender [Thu, 3 Jul 2014 19:24:12 +0000 (21:24 +0200)]
Change mixed @param doc for PatrolLog::record
Change-Id: I5323144faa48eb7da8db15a5aa143e103029961f
Kevin Israel [Sat, 5 Jul 2014 20:42:55 +0000 (16:42 -0400)]
Only list Special:CreateAccount as restricted if configured so
Bug: 67549
Change-Id: I433d825d99878f385c607346bed92b01a79d9a21
Translation updater bot [Sat, 5 Jul 2014 19:45:39 +0000 (19:45 +0000)]
Localisation updates from https://translatewiki.net.
Change-Id: I8eb2ba8d20eaf824efeb165acb8a1290bb5c3bf8
Rohan [Wed, 25 Jun 2014 16:39:04 +0000 (22:09 +0530)]
Disables upload by url option for users without the necessary permissions
Does an explicit check for a true value in SpecialUpload::getSourceSection
Bug: 39507
Change-Id: I00297494230d07081dd85a810321446badc3ecb0
Kunal Mehta [Sat, 28 Jun 2014 20:40:22 +0000 (13:40 -0700)]
Add tests for OutputPage::makeResourceLoaderLink()
Change-Id: I22dc7fd1003f07ab0be61bb4645b45a9db9f2548
jenkins-bot [Fri, 4 Jul 2014 23:06:14 +0000 (23:06 +0000)]
Merge "API: Refactor continuation code and add to purge, watch, etc."
Translation updater bot [Fri, 4 Jul 2014 21:39:44 +0000 (21:39 +0000)]
Merge "Localisation updates from https://translatewiki.net."
Translation updater bot [Fri, 4 Jul 2014 21:20:09 +0000 (21:20 +0000)]
Localisation updates from https://translatewiki.net.
Change-Id: Iadb3673f398ec110d1393cec733d1d5b786e6e86
jenkins-bot [Fri, 4 Jul 2014 21:11:41 +0000 (21:11 +0000)]
Merge "@singe -> @since in doc"
umherirrender [Fri, 4 Jul 2014 20:53:47 +0000 (22:53 +0200)]
@singe -> @since in doc
Change-Id: I25fcd1930bd719af2c46c3540f4a48ab44d47ded
umherirrender [Fri, 4 Jul 2014 20:41:05 +0000 (22:41 +0200)]
Remove @private/@public/@void where visibility already set
When private is set php side on the function, no need to have it in the
param docs.
Change-Id: Ieaeac99c131b7360b1f324244d8be6f9ff854dd2
jenkins-bot [Fri, 4 Jul 2014 19:49:44 +0000 (19:49 +0000)]
Merge "Force array parameters in SiteConfiguration"
jenkins-bot [Fri, 4 Jul 2014 19:49:42 +0000 (19:49 +0000)]
Merge "Don't use isset() to check for null"
jenkins-bot [Fri, 4 Jul 2014 19:49:13 +0000 (19:49 +0000)]
Merge "Don't use isset() to check for null"
Brad Jorsch [Fri, 7 Feb 2014 01:52:58 +0000 (20:52 -0500)]
API: Refactor continuation code and add to purge, watch, etc.
While generator support was added to various actions, the continuation
parameters from the generators weren't being returned to the client.
This patch refactors the code for handling continuation out of ApiQuery
and into ApiResult, and then uses it in the other actions that need it.
Bug: 60734
Change-Id: I1a6e51cdc964ddcdd69aaa2f735223371233e8af
Alexandre Emsenhuber [Fri, 4 Jul 2014 19:20:22 +0000 (21:20 +0200)]
Don't use isset to check for null
Change isset() checks for variables that are always defined.
Change-Id: Ic96b9661d94742909c0d6b62a8eb2f6a038a774f
Amir E. Aharoni [Sun, 8 Jun 2014 18:55:16 +0000 (21:55 +0300)]
Add grammar forms for Russian
This adds support for the Russian name of Wikimedia Commons.
Change-Id: If531e9ff8f46ac5294b117eec43172b4975e2ad6
jenkins-bot [Fri, 4 Jul 2014 10:58:39 +0000 (10:58 +0000)]
Merge "Add a file icon for xcf file type"
Brian Wolff [Fri, 4 Jul 2014 02:54:47 +0000 (23:54 -0300)]
Add a file icon for xcf file type
This icon comes from the crystal icon set (like all the other
icons here). They are licensed LGPL. See the COPYING file
in the skins/common/images/icons directory.
It was downloaded from
https://upload.wikimedia.org/wikipedia/commons/4/4f/Xcf.png
This goes along with change I127bcb5458, which caused the icon
to be shown for indexed xcf files.
Change-Id: I72aa00c4e605ff67f62f855c1475a07433fd4567
Brian Wolff [Fri, 4 Jul 2014 07:59:11 +0000 (07:59 +0000)]
Merge "Add unit tests for ffmpeg2theora ogg recognition bug"
Brian Wolff [Sun, 29 Jun 2014 23:46:40 +0000 (20:46 -0300)]
Add unit tests for ffmpeg2theora ogg recognition bug
Change-Id: I2e6944ccff3882b9f9ee1ac5ab6f5fea1de9d353
Follow-up:
629169ce9bd7
jenkins-bot [Fri, 4 Jul 2014 07:47:57 +0000 (07:47 +0000)]
Merge "Do thumb attempt-failures limitting via sha1 instead of name."
jenkins-bot [Fri, 4 Jul 2014 07:45:14 +0000 (07:45 +0000)]
Merge "Don't try to render indexed xcf images with image magick."
jenkins-bot [Fri, 4 Jul 2014 07:43:42 +0000 (07:43 +0000)]
Merge "Fix mime detection of easily-confused-with text/plain formats"
jenkins-bot [Fri, 4 Jul 2014 07:19:30 +0000 (07:19 +0000)]
Merge "Detect chemical table files: Add them to MIME listings"
rillke [Sat, 21 Jun 2014 09:09:00 +0000 (11:09 +0200)]
Detect chemical table files: Add them to MIME listings
Adding mol, sdf, rxn, rd and rg file types to mime.types and mime.info
map to make them known to MediaWiki by default.
PHP's own module fileinfo module is not capable detecting Chemical
table files. Instead, they are reported as text/plain.
MediaHandlers can be attached by MIME type only. That's why these
changes are required for [[Extension:MolHandler]] to work.
Change-Id: I017507e4a950b3ce4e6576d12217cd42a337bad6
umherirrender [Mon, 23 Jun 2014 18:18:47 +0000 (20:18 +0200)]
Remove deprecated class FormatExif
Deprecated and warnings since 1.18
Change-Id: I2461383bb2d3c5fc00ffb5f45bc8e931ed9acb58
Brian Wolff [Tue, 24 Jun 2014 19:15:32 +0000 (16:15 -0300)]
Fix mime detection of easily-confused-with text/plain formats
json, csv, and tsv are often detected as text/plain. However that's
not right. This patch causes MediaWiki to look at the file extension
of files detected as text/plain, and if the file extension is
for a "textual" type, use the mime type associated with that extension.
This change also changes the "does mime type match uploaded file
extension" check to use the mime based on the file contents
plus extension, as opposed to just the file contents. Various
documentation suggests this is more appropriate (e.g. line 807
of MimeMagic.php). In my opinion we should use just the file
contents when verifying file is not on blacklist, but use ext
when verifying file type matches extension, and for decided
what handler specific checks to run. Not the detect mime type
with extension doesn't override the detected mime type with
the extension, but only uses the extension if content based
detection is ambigious or not specific enough.
This patch should be reviewed by csteipp before merge for
any potential security implications.
Note: This is partially fixing a regression from
3846d1048766a7,
where previously csv and json files were allowed to be uploaded,
and that change prevented them
Bug: 66036
Bug: 45424
Change-Id: Ib637fe6850a81b26f84dc8c00ab4772f3d3a1f34
Brian Wolff [Fri, 4 Jul 2014 04:46:10 +0000 (01:46 -0300)]
Fix alpha transparency in XCF images
The -layers merge option flattens all layers on to a canvas
of whatever color -background is set to. However -background
was white for the PNG bKGD chunk. Set it to transparent just
for the -layers merge operation.
This works well on most recent image magick. Older image magick
explodes on my test image (I tested 6.6.0-4), so unclear if it
works there, but it certainly didn't make anything worse.
Wikimedia uses a version between the two that I tested so hopefully
this will make things better, and if it doesn't, it eventually will
when we update image magick.
Bug: 35622
Change-Id: I77601cdf005a64ae8ea7516cc846620431917863
Brian Wolff [Fri, 4 Jul 2014 02:07:38 +0000 (23:07 -0300)]
Don't try to render indexed xcf images with image magick.
Image magick doesn't support them.
See some discussion at bug 35622 comment 9
Change-Id: I127bcb5458a4c06f043a4f5d0ae6d70bd7809e64
Chad Horohoe [Fri, 4 Jul 2014 00:58:43 +0000 (17:58 -0700)]
Don't link to PHP @ php.net when running HHVM
Change-Id: Ifdec12e093fdd29d76ccb4b9e3ec58a6bceb47ed
jenkins-bot [Thu, 3 Jul 2014 23:59:11 +0000 (23:59 +0000)]
Merge "Fixed broken exception code"
jenkins-bot [Thu, 3 Jul 2014 23:44:08 +0000 (23:44 +0000)]
Merge "Use some callable hints on @param docs"
Aaron Schulz [Thu, 3 Jul 2014 23:37:25 +0000 (16:37 -0700)]
Fixed broken exception code
Change-Id: Id399cb22f183d75acc006e698feb161bd12096bd
Alexandre Emsenhuber [Thu, 3 Jul 2014 19:48:08 +0000 (21:48 +0200)]
Force array parameters in SiteConfiguration
Now that we require PHP 5.1 (for quite some time actually)
we can force method parameters to be array.
Change-Id: Ia4a262320344e05cc1625c041a3aa4ec41034ad7
Alexandre Emsenhuber [Thu, 3 Jul 2014 19:41:05 +0000 (21:41 +0200)]
Don't use isset() to check for null
- Remove isset for defined member variables
- Add a missing definition of member variable $mTextId
- Fix documentation of $mTextRow
- Standardize checks for null to use "=== null" or "!== null"
instead of is_null()
Change-Id: I56e364bc14b5a3961a2538371ae4b0088babc5c7
umherirrender [Thu, 3 Jul 2014 19:20:35 +0000 (21:20 +0200)]
Use some callable hints on @param docs
Callbacks can be given as a string or array, so the hint 'callable' is
used.
Change-Id: I3842606f74c8c3705dffc70bf13e31f44a37fa65
Translation updater bot [Thu, 3 Jul 2014 18:49:46 +0000 (18:49 +0000)]
Localisation updates from https://translatewiki.net.
Change-Id: I19bae9c3074a69f36a12636ce23434681d763c7c
jenkins-bot [Thu, 3 Jul 2014 18:26:43 +0000 (18:26 +0000)]
Merge "HTMLForm submission callback documentation updates"
jenkins-bot [Thu, 3 Jul 2014 17:46:48 +0000 (17:46 +0000)]
Merge "Allow local interwiki links with an empty title part"