Commit graph

36142 commits

Author SHA1 Message Date
Kunal Mehta
0e17070d40 Require PHP >= 5.3.3
Bug: T839
Change-Id: Iac827ef8505ff0653a40e45d759b0f79619351ee
2014-10-30 10:10:52 -07:00
jenkins-bot
3e8c0191a3 Merge "Fix creating non-parameterized hashes in ParameterizedPassword" 2014-10-30 00:17:07 +00:00
Aaron Schulz
5e5bf769fe Fixed possible db error log spam when cluster=* in wfWaitForSlaves()
Change-Id: Idd385cddb0fa9f56bddc46d41ae584ca65bc45ed
2014-10-29 16:36:55 -07:00
jenkins-bot
d47c1e9230 Merge "resourceloader: Add support for delivering templates" 2014-10-29 20:58:57 +00:00
Translation updater bot
605e69ffed Localisation updates from https://translatewiki.net.
Change-Id: I7ffe726ba42ee3e2ab55cc9088017c84348ed9c9
2014-10-29 21:37:18 +01:00
jdlrobson
ebeb297236 resourceloader: Add support for delivering templates
A base ResourceLoaderModule::getTemplates() exists for subclasses
to override. An implementation is provided for ResourceLoaderFileModule.

For file modules, templates can be specified in the following manner:

'example' => array(
	'templates' => array(
		'bar' => 'templates/foo.html',
	),
	'scripts' => 'example.js',
),

The delivery system is template language agnostic, and currently
only supports "compiling" plain HTML templates.

This also adds template support to the following modules as a POC:
* mediawiki.feedback
* mediawiki.action.view.postEdit
* mediawiki.special.upload

Works with $wgResourceLoaderStorageEnabled

Change-Id: Ia0c5c8ec960aa6dff12c9626cee41ae9a3286b76
2014-10-29 19:31:16 +00:00
Bryan Davis
28a7ce420b Use MWLogger logging for legacy logging methods
Send wfDebug, wfDebugLog, wfLogDBError and wfLogDBError log messages to
the new MWLogger PSR-3 logger subsystem. Compatibility with the historic
logging operations of wfLogDBError are provided by MWLoggerLegacyLogger
and the MWLoggerLegacySpi logger factory.

Requires the MWLogger system introduced in I5c82299 and the Composer
managed libraries from Ie667944.

Change-Id: I1e5596d590144fbfdfd5f18bc42cf1ef0dbcac12
2014-10-29 11:55:08 -07:00
jenkins-bot
79168e0f8b Merge "Add more detailed upload stash error messages" 2014-10-29 17:40:53 +00:00
Southparkfan
19d294e1bd Fix spelling mistake: s/databses/database
Change-Id: Id532b3724792eff5849813888533c251b99edc82
2014-10-29 13:12:45 -04:00
Brad Jorsch
f62bc7536e API: Fix access on getExamplesMessages
ApiBase declares it protected, but for some reason I had made it public
in all subclasses.

Change-Id: I8a50d4f47e66c7f09137968d3941dc5cdc1d28e4
2014-10-29 11:15:27 -04:00
Aaron Schulz
17cc78767a Switch to LOCK IN SHARE MODE in recordUpload2()
* We just need the latest data; the advisory locking in lock()
  already manages mutual exclusion.

Change-Id: I9af7a892b2dcafd30149332b0084f61d117c9cad
2014-10-29 06:59:51 +00:00
Chad Horohoe
d4c77064a2 Remove back-compat profiling configuration
This old style was deprecated like 3 or 4 releases ago

Change-Id: Ic61424aacb376151019a08ade214fea655d82a3f
2014-10-28 17:21:23 -07:00
jenkins-bot
09999942fa Merge "Deprecate internal ORMTable::unprefixFieldName(s)" 2014-10-28 21:41:19 +00:00
jenkins-bot
9badb24d1a Merge "CoreTagHooks: Use parse() for output to HTML rather than text()" 2014-10-28 20:46:44 +00:00
Bartosz Dziewoński
0f97573ce9 CoreTagHooks: Use parse() for output to HTML rather than text()
Change-Id: I9f28afe185a24883fb575dd6df8a23c4ab233b64
2014-10-28 20:57:47 +01:00
jenkins-bot
5ac3150f6a Merge "Localisation updates from https://translatewiki.net." 2014-10-28 17:30:52 +00:00
Translation updater bot
ca2f841cb2 Localisation updates from https://translatewiki.net.
Change-Id: I56c63f14f34232741d1f6a3bdb3b64b2cd45e609
2014-10-28 18:22:52 +01:00
jenkins-bot
0cde9bc48c Merge "ApiHelp: Fix PHP notice when "wrap" parameter is provided" 2014-10-28 15:15:55 +00:00
Translation updater bot
0d750d533f Localisation updates from https://translatewiki.net.
Change-Id: I24b13302922d658dc555df91bd1a460027f7f76d
2014-10-28 15:08:16 +01:00
Kevin Israel
e241959c0d ApiHelp: Fix PHP notice when "wrap" parameter is provided
An incorrect variable name was used, so the "help" property of
the "help" object in the output was merely encoded as null.

Change-Id: Ia1a8c8ad4515e216998d4975aad3555f87d24380
2014-10-28 03:03:06 -04:00
jenkins-bot
ccbfb671ec Merge "Use Parser::OT_PREPROCESS class const" 2014-10-27 19:59:03 +00:00
Mark Holmquist
7585e214d2 Add more detailed upload stash error messages
There are seven (used) error types in the stash class, and we umbrella'd
them all into one error message, which is mighty silly. This should give
us more information.

Also added to the mw.Api.errors list so UploadWizard can handle them.

Change-Id: I79bf0c29a4cef19363d111cc1128e35256ae572a
2014-10-27 19:41:25 +00:00
jenkins-bot
31ef64d21c Merge "Validate cmstarthexsortkey/cmendhexsortkey to be valid hex" 2014-10-27 19:17:13 +00:00
umherirrender
69df5addef Validate cmstarthexsortkey/cmendhexsortkey to be valid hex
Avoids: Warning: pack(): Type H: illegal hex digit N in
\includes\api\ApiQueryCategoryMembers.php on line 146

Bug: 40809
Change-Id: I1dd732ccec8e6991d0ceac443226f5c7e59fd853
2014-10-27 20:09:25 +01:00
Translation updater bot
5e48fc85ef Localisation updates from https://translatewiki.net.
Change-Id: I1cecca3a0fe4c99a1ecfca9ac3c7178801812086
2014-10-27 19:33:41 +01:00
jenkins-bot
fb114d6d8a Merge "Replace a few more logical operators" 2014-10-27 17:59:06 +00:00
jenkins-bot
a5ecde4f1d Merge "SqlBagOStuff: reuse code of parent class" 2014-10-27 17:56:11 +00:00
jenkins-bot
da6b7ba8d2 Merge "Tweaked some of the default LockManager ttls" 2014-10-27 17:51:39 +00:00
jenkins-bot
b3385d9e9c Merge "API: Standardize usage of "ID" in docs" 2014-10-27 17:16:57 +00:00
jenkins-bot
752df151c6 Merge "Make $wgMWLoggerDefaultSpi more expressive" 2014-10-27 17:08:04 +00:00
Brad Jorsch
3e88440351 API: Standardize usage of "ID" in docs
Change-Id: I6c0571ceb836d35159964ead4abef09113230a68
2014-10-27 12:51:29 -04:00
jenkins-bot
ac75aedc20 Merge "Add mediawiki.userSuggest to Special:UserRights" 2014-10-27 00:10:37 +00:00
Translation updater bot
887d92d8d6 Localisation updates from https://translatewiki.net.
Change-Id: Ieacc0d6d4d0ca696d91d3358a4d2415ed7d37659
2014-10-26 20:48:29 +01:00
Bryan Davis
51b37035b3 Make $wgMWLoggerDefaultSpi more expressive
Allow $wgMWLoggerDefaultSpi to specify a more expressive object creation
by introducing a new ObjectFactory class which can process an array of
instructions to call either an object constructor or a factory method
with an array of arguments. This allows removal of the
$wgMWLoggerMonologSpiConfig global variable in favor of configuration
using $wgMWLoggerDefaultSpi.

New classes introduced:
; ObjectFactory
: Construct objects from configuration instructions.

Change-Id: If56cce5dcb1ad5712e238d6e2dab809a351f79be
2014-10-25 16:00:06 -06:00
Sergio Santoro
807b24eb27 SqlBagOStuff: reuse code of parent class
It'll be easier to change the time threshold (currently 10 years)
in the future.

Change-Id: I24005148d40c47905d5b20cfd506decef2ae447e
2014-10-25 19:26:21 +02:00
jenkins-bot
ccf85402b2 Merge "Fix (" 2014-10-25 00:30:57 +00:00
Kunal Mehta
cba15a69ae Fix (
See <http://xkcd.com/859/>

Change-Id: I21113b158159d9a8a14045da87581937f71f42e3
2014-10-24 17:15:12 -07:00
Brian Wolff
c3747dadee Make "View/restore X deleted edits" check permissions per title
This will ensure the prompt is shown for people who have
viewdeletedfile from f7aac5ae.

Change-Id: I6379413c8da01bcb878da8fbe77278bfc38529bc
2014-10-24 19:40:42 -03:00
Florianschmidtwelzow
a00d57bbff Add deprecated note to SkinTemplate
Like mentioned in todo. Planned with 1.20, but now officially deprecated
since 1.25.

Change-Id: I2eabb642151f7e7ff05b52ff6718e78931604828
2014-10-24 22:25:42 +02:00
jenkins-bot
08aaea93e3 Merge "FormatJson::stripComments" 2014-10-24 18:47:29 +00:00
umherirrender
2ddb67aae7 Use Parser::OT_PREPROCESS class const
Instead of the global const

Change-Id: Ica9a3fdd0a48bb3c71ebb2b84933149a9f275fac
2014-10-24 20:40:19 +02:00
jenkins-bot
2dfacba930 Merge "Allow search to return matching category" 2014-10-24 17:01:58 +00:00
Kevin Israel
36c0da63cd Replace a few more logical operators
Changed all remaining uses of 'and' (T_LOGICAL_AND) and 'or'
(T_LOGICAL_OR) except those in includes/libs/lessc.inc.php.

In maintenance/generateSitemap.php, also slightly cleaned up
touched code:

* Inlined GenerateSitemap::init_path().
* Removed the redundant `$fspath && !is_dir( $fspath )` check.
* Return a nonzero exit code if wfMkdirParents() fails.

There are still uses of 'xor' (T_LOGICAL_XOR) in the following
files, which I left as-is:

* includes/Export.php
* includes/htmlform/HTMLCheckField.php
* includes/Autopromote.php
* maintenance/importDump.php
* maintenance/backup.inc

Change-Id: I73cb20da989e90b52782e7499f633debd5ad265d
2014-10-24 11:41:00 -04:00
Reedy
8e6fa108b8 or -> ||
Change-Id: Ic591f06f70c68bb2912b7f028f7f988eb658375d
2014-10-24 11:26:14 +01:00
Aaron Schulz
54f1b2373b Tweaked some of the default LockManager ttls
Change-Id: Ic2c58ef02dc686f38840fe974a9d2858cd15c019
2014-10-23 22:19:19 -07:00
Nik Everett
f682aced27 Allow search to return matching category
Will be used by Cirrus.

Change-Id: I60e6b19d3b59ebf9bb45cc61d16936dfc7e4c708
2014-10-23 20:15:18 -04:00
jenkins-bot
df54955cc5 Merge "Swap and for &&" 2014-10-23 22:25:22 +00:00
jenkins-bot
d1870da545 Merge "resourceloader: Add ResourceLoaderContext::getUserObj and replace use of $wgUser" 2014-10-23 21:25:24 +00:00
Kunal Mehta
e7a0759f20 resourceloader: Add ResourceLoaderContext::getUserObj and replace use of $wgUser
Introduces ResourceLoaderContext::getUserObj(), which gets
a (possibly cached) User object for the context's username.

Use this instead of the $wgUser global.

Change-Id: Ifd9f634db145381625ab68067ae67791a3f494b8
2014-10-23 14:09:30 -07:00
Chad Horohoe
6c30fff0ba Swap and for &&
Change-Id: I7821a62586cc2d2f929fb3d7d5046958a70efbd0
2014-10-23 13:03:14 -07:00