aboutsummaryrefslogtreecommitdiffstats
path: root/includes
Commit message (Collapse)AuthorAgeFilesLines
* Localisation updates from https://translatewiki.net.Translation updater bot2014-10-298-2/+104
| | | | Change-Id: I7ffe726ba42ee3e2ab55cc9088017c84348ed9c9
* Use MWLogger logging for legacy logging methodsBryan Davis2014-10-295-110/+399
| | | | | | | | | | | | 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
* Merge "Add more detailed upload stash error messages"jenkins-bot2014-10-292-3/+46
|\
| * Add more detailed upload stash error messagesMark Holmquist2014-10-272-3/+46
| | | | | | | | | | | | | | | | | | | | 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
* | Fix spelling mistake: s/databses/databaseSouthparkfan2014-10-291-1/+1
| | | | | | | | Change-Id: Id532b3724792eff5849813888533c251b99edc82
* | API: Fix access on getExamplesMessagesBrad Jorsch2014-10-2983-83/+83
| | | | | | | | | | | | | | ApiBase declares it protected, but for some reason I had made it public in all subclasses. Change-Id: I8a50d4f47e66c7f09137968d3941dc5cdc1d28e4
* | Switch to LOCK IN SHARE MODE in recordUpload2()Aaron Schulz2014-10-291-2/+4
| | | | | | | | | | | | | | * We just need the latest data; the advisory locking in lock() already manages mutual exclusion. Change-Id: I9af7a892b2dcafd30149332b0084f61d117c9cad
* | Remove back-compat profiling configurationChad Horohoe2014-10-281-4/+0
| | | | | | | | | | | | This old style was deprecated like 3 or 4 releases ago Change-Id: Ic61424aacb376151019a08ade214fea655d82a3f
* | Merge "Deprecate internal ORMTable::unprefixFieldName(s)"jenkins-bot2014-10-282-5/+24
|\ \
| * | Deprecate internal ORMTable::unprefixFieldName(s)Thiemo Mättig2014-10-212-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unprefixFieldNames is not used anywhere outside of the class. Why should it? unprefixFieldName became unused in I19194f1, but I did not removed it because it is public. The fact that both methods are public is a mistake as far as I can tell. I can't think of a good reason to do that. Change-Id: Iafc527b5d534648a962a8c2015d21403362bb573
* | | Merge "CoreTagHooks: Use parse() for output to HTML rather than text()"jenkins-bot2014-10-281-1/+1
|\ \ \
| * | | CoreTagHooks: Use parse() for output to HTML rather than text()Bartosz Dziewoński2014-10-281-1/+1
| | | | | | | | | | | | | | | | Change-Id: I9f28afe185a24883fb575dd6df8a23c4ab233b64
* | | | Merge "Localisation updates from https://translatewiki.net."jenkins-bot2014-10-2827-115/+2390
|\ \ \ \
| * | | | Localisation updates from https://translatewiki.net.Translation updater bot2014-10-2827-115/+2390
| | | | | | | | | | | | | | | | | | | | Change-Id: I56c63f14f34232741d1f6a3bdb3b64b2cd45e609
* | | | | Merge "ApiHelp: Fix PHP notice when "wrap" parameter is provided"jenkins-bot2014-10-281-1/+1
|\ \ \ \ \
| * | | | | ApiHelp: Fix PHP notice when "wrap" parameter is providedKevin Israel2014-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Localisation updates from https://translatewiki.net.Translation updater bot2014-10-281-2/+0
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I24b13302922d658dc555df91bd1a460027f7f76d
* | | | | Merge "Use Parser::OT_PREPROCESS class const"jenkins-bot2014-10-274-5/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Use Parser::OT_PREPROCESS class constumherirrender2014-10-244-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of the global const Change-Id: Ica9a3fdd0a48bb3c71ebb2b84933149a9f275fac
* | | | | Merge "Validate cmstarthexsortkey/cmendhexsortkey to be valid hex"jenkins-bot2014-10-271-0/+16
|\ \ \ \ \
| * | | | | Validate cmstarthexsortkey/cmendhexsortkey to be valid hexumherirrender2014-10-271-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids: Warning: pack(): Type H: illegal hex digit N in \includes\api\ApiQueryCategoryMembers.php on line 146 Bug: 40809 Change-Id: I1dd732ccec8e6991d0ceac443226f5c7e59fd853
* | | | | | Localisation updates from https://translatewiki.net.Translation updater bot2014-10-271-2/+3
| |_|/ / / |/| | | | | | | | | | | | | | Change-Id: I1cecca3a0fe4c99a1ecfca9ac3c7178801812086
* | | | | Merge "Replace a few more logical operators"jenkins-bot2014-10-272-6/+2
|\ \ \ \ \
| * | | | | Replace a few more logical operatorsKevin Israel2014-10-242-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "SqlBagOStuff: reuse code of parent class"jenkins-bot2014-10-271-10/+3
|\ \ \ \ \ \
| * | | | | | SqlBagOStuff: reuse code of parent classSergio Santoro2014-10-251-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It'll be easier to change the time threshold (currently 10 years) in the future. Change-Id: I24005148d40c47905d5b20cfd506decef2ae447e
* | | | | | | Merge "Tweaked some of the default LockManager ttls"jenkins-bot2014-10-271-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Tweaked some of the default LockManager ttlsAaron Schulz2014-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic2c58ef02dc686f38840fe974a9d2858cd15c019
* | | | | | | | Merge "API: Standardize usage of "ID" in docs"jenkins-bot2014-10-271-24/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | API: Standardize usage of "ID" in docsBrad Jorsch2014-10-271-24/+24
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c0571ceb836d35159964ead4abef09113230a68
* | | | | | | | Merge "Make $wgMWLoggerDefaultSpi more expressive"jenkins-bot2014-10-276-147/+188
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Make $wgMWLoggerDefaultSpi more expressiveBryan Davis2014-10-256-147/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge "Add mediawiki.userSuggest to Special:UserRights"jenkins-bot2014-10-271-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add mediawiki.userSuggest to Special:UserRightsumherirrender2014-10-181-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives a suggestion list when typing a username Bug: 48240 Change-Id: I35dc9c4cf62c7a7ff5214d804d65b4ac9feeb897
* | | | | | | | | Localisation updates from https://translatewiki.net.Translation updater bot2014-10-262-1/+10
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieacc0d6d4d0ca696d91d3358a4d2415ed7d37659
* | | | | | | | Merge "Fix ("jenkins-bot2014-10-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix (Kunal Mehta2014-10-241-1/+1
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See <http://xkcd.com/859/> Change-Id: I21113b158159d9a8a14045da87581937f71f42e3
* | | | | | | | Make "View/restore X deleted edits" check permissions per titleBrian Wolff2014-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will ensure the prompt is shown for people who have viewdeletedfile from f7aac5ae. Change-Id: I6379413c8da01bcb878da8fbe77278bfc38529bc
* | | | | | | | Add deprecated note to SkinTemplateFlorianschmidtwelzow2014-10-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like mentioned in todo. Planned with 1.20, but now officially deprecated since 1.25. Change-Id: I2eabb642151f7e7ff05b52ff6718e78931604828
* | | | | | | | Merge "FormatJson::stripComments"jenkins-bot2014-10-241-1/+87
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | FormatJson::stripCommentsBryan Davis2014-10-121-1/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add stripComments method that can be used to remove single line and multiline comments from an otherwise valid JSON string. Inspired by the comment removal code in redisJobRunnerService and discussions on irc about the Extension registration RFC. Change-Id: Ie743957bfbb7b1fca8cb78ad48c1efd953362fde
* | | | | | | | Merge "Allow search to return matching category"jenkins-bot2014-10-242-4/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Allow search to return matching categoryNik Everett2014-10-232-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will be used by Cirrus. Change-Id: I60e6b19d3b59ebf9bb45cc61d16936dfc7e4c708
* | | | | | | | or -> ||Reedy2014-10-242-2/+2
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Change-Id: Ic591f06f70c68bb2912b7f028f7f988eb658375d
* | | | | | | Merge "Swap and for &&"jenkins-bot2014-10-236-8/+8
|\ \ \ \ \ \ \
| * | | | | | | Swap and for &&Chad Horohoe2014-10-236-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7821a62586cc2d2f929fb3d7d5046958a70efbd0
* | | | | | | | Merge "resourceloader: Add ResourceLoaderContext::getUserObj and replace use ↵jenkins-bot2014-10-236-30/+41
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | of $wgUser"
| * | | | | | | resourceloader: Add ResourceLoaderContext::getUserObj and replace use of $wgUserKunal Mehta2014-10-236-30/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge "Respect $wgApiFrameOptions in formatted API output mode"jenkins-bot2014-10-232-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Respect $wgApiFrameOptions in formatted API output modeBrian Wolff2014-10-232-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This restores the pre- d25cb992 behaviour. Apparently UploadWizard's flickr module relies on this (Which seems rather wrong, but regardless I still think api handling of $wgApiFrameOptions should extend to the "fm" modes.) Note: If $wgBreakFrames is true, then frames will still be broken. Although this is a change from prior behaviour, it makes sense to me that $wgBreakFrames would not allow the human readable output of the API be frammed. Bug: 72340 Change-Id: Ia61a4698f7044acfcd7339207590d9333f4100cb