From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 15 May 2015 20:23:00 +0000 (+0000)
Subject: Merge "ApiOpenSearch: Don't output warnings in JSON mode"
X-Git-Tag: 1.31.0-rc.0~11395
X-Git-Url: https://git.heureux-cyclage.org/w/index.php?a=commitdiff_plain;h=fed9e3e163c5e4debffdcb03bfb0ceec7fec8f0d;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "ApiOpenSearch: Don't output warnings in JSON mode"
---

fed9e3e163c5e4debffdcb03bfb0ceec7fec8f0d
diff --combined autoload.php
index 8b80295b54,a285049985..c81c4bb118
--- a/autoload.php
+++ b/autoload.php
@@@ -8,7 -8,6 +8,7 @@@ $wgAutoloadLocalClasses = array
  	'AbstractContent' => __DIR__ . '/includes/content/AbstractContent.php',
  	'Action' => __DIR__ . '/includes/actions/Action.php',
  	'ActiveUsersPager' => __DIR__ . '/includes/specials/SpecialActiveusers.php',
 +	'ActivityUpdateJob' => __DIR__ . '/includes/jobqueue/jobs/ActivityUpdateJob.php',
  	'AjaxDispatcher' => __DIR__ . '/includes/AjaxDispatcher.php',
  	'AjaxResponse' => __DIR__ . '/includes/AjaxResponse.php',
  	'AllMessagesTablePager' => __DIR__ . '/includes/specials/SpecialAllMessages.php',
@@@ -61,6 -60,7 +61,7 @@@
  	'ApiModuleManager' => __DIR__ . '/includes/api/ApiModuleManager.php',
  	'ApiMove' => __DIR__ . '/includes/api/ApiMove.php',
  	'ApiOpenSearch' => __DIR__ . '/includes/api/ApiOpenSearch.php',
+ 	'ApiOpenSearchFormatJson' => __DIR__ . '/includes/api/ApiOpenSearch.php',
  	'ApiOptions' => __DIR__ . '/includes/api/ApiOptions.php',
  	'ApiPageSet' => __DIR__ . '/includes/api/ApiPageSet.php',
  	'ApiParamInfo' => __DIR__ . '/includes/api/ApiParamInfo.php',
@@@ -994,7 -994,7 +995,7 @@@
  	'RenderAction' => __DIR__ . '/includes/actions/RenderAction.php',
  	'ReplacementArray' => __DIR__ . '/includes/libs/ReplacementArray.php',
  	'Replacer' => __DIR__ . '/includes/libs/replacers/Replacer.php',
 -	'ReplicatedBagOStuff' => __DIR__ . '/includes/objectcache/ReplicatedBagOStuff.php',
 +	'ReplicatedBagOStuff' => __DIR__ . '/includes/libs/objectcache/ReplicatedBagOStuff.php',
  	'RepoGroup' => __DIR__ . '/includes/filerepo/RepoGroup.php',
  	'RequestContext' => __DIR__ . '/includes/context/RequestContext.php',
  	'ResetUserTokens' => __DIR__ . '/maintenance/resetUserTokens.php',
@@@ -1009,7 -1009,6 +1010,7 @@@
  	'ResourceLoaderLanguageDataModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderLanguageDataModule.php',
  	'ResourceLoaderLanguageNamesModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderLanguageNamesModule.php',
  	'ResourceLoaderModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderModule.php',
 +	'ResourceLoaderRawFileModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderRawFileModule.php',
  	'ResourceLoaderSiteModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderSiteModule.php',
  	'ResourceLoaderSkinModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderSkinModule.php',
  	'ResourceLoaderSpecialCharacterDataModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php',
diff --combined includes/api/i18n/en.json
index 3c53be155d,9b1501b567..e10c66057e
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@@ -242,6 -242,7 +242,7 @@@
  	"apihelp-opensearch-param-suggest": "Do nothing if <var>[[mw:Manual:$wgEnableOpenSearchSuggest|$wgEnableOpenSearchSuggest]]</var> is false.",
  	"apihelp-opensearch-param-redirects": "How to handle redirects:\n;return:Return the redirect itself.\n;resolve:Return the target page. May return fewer than $1limit results.\nFor historical reasons, the default is \"return\" for $1format=json and \"resolve\" for other formats.",
  	"apihelp-opensearch-param-format": "The format of the output.",
+ 	"apihelp-opensearch-param-warningsaserror": "If warnings are raised with <kbd>format=json</kbd>, return an API error instead of ignoring them.",
  	"apihelp-opensearch-example-te": "Find pages beginning with <kbd>Te</kbd>.",
  
  	"apihelp-options-description": "Change preferences of the current user.\n\nOnly options which are registered in core or in one of installed extensions, or options with keys prefixed with \"userjs-\" (intended to be used by user scripts), can be set.",
@@@ -271,29 -272,7 +272,29 @@@
  	"apihelp-parse-param-pageid": "Parse the content of this page. Overrides <var>$1page</var>.",
  	"apihelp-parse-param-redirects": "If <var>$1page</var> or <var>$1pageid</var> is set to a redirect, resolve it.",
  	"apihelp-parse-param-oldid": "Parse the content of this revision. Overrides <var>$1page</var> and <var>$1pageid</var>.",
 -	"apihelp-parse-param-prop": "Which pieces of information to get:\n;text:Gives the parsed text of the wikitext.\n;langlinks:Gives the language links in the parsed wikitext.\n;categories:Gives the categories in the parsed wikitext.\n;categorieshtml:Gives the HTML version of the categories.\n;links:Gives the internal links in the parsed wikitext.\n;templates:Gives the templates in the parsed wikitext.\n;images:Gives the images in the parsed wikitext.\n;externallinks:Gives the external links in the parsed wikitext.\n;sections:Gives the sections in the parsed wikitext.\n;revid:Adds the revision ID of the parsed page.\n;displaytitle:Adds the title of the parsed wikitext.\n;headitems:Gives items to put in the &lt;head&gt; of the page.\n;headhtml:Gives parsed &lt;head&gt; of the page.\n;modules:Gives the ResourceLoader modules used on the page.\n;indicators:Gives the HTML of page status indicators used on the page.\n;iwlinks:Gives interwiki links in the parsed wikitext.\n;wikitext:Gives the original wikitext that was parsed.\n;properties:Gives various properties defined in the parsed wikitext.\n;limitreportdata:Gives the limit report in a structured way. Gives no data, when $1disablepp is set.\n;limitreporthtml:Gives the HTML version of the limit report. Gives no data, when $1disablepp is set.",
 +	"apihelp-parse-param-prop": "Which pieces of information to get:",
 +	"apihelp-parse-paramvalue-prop-text": "Gives the parsed text of the wikitext.",
 +	"apihelp-parse-paramvalue-prop-langlinks": "Gives the language links in the parsed wikitext.",
 +	"apihelp-parse-paramvalue-prop-categories": "Gives the categories in the parsed wikitext.",
 +	"apihelp-parse-paramvalue-prop-categorieshtml": "Gives the HTML version of the categories.",
 +	"apihelp-parse-paramvalue-prop-links": "Gives the internal links in the parsed wikitext.",
 +	"apihelp-parse-paramvalue-prop-templates": "Gives the templates in the parsed wikitext.",
 +	"apihelp-parse-paramvalue-prop-images": "Gives the images in the parsed wikitext.",
 +	"apihelp-parse-paramvalue-prop-externallinks": "Gives the external links in the parsed wikitext.",
 +	"apihelp-parse-paramvalue-prop-sections": "Gives the sections in the parsed wikitext.",
 +	"apihelp-parse-paramvalue-prop-revid": "Adds the revision ID of the parsed page.",
 +	"apihelp-parse-paramvalue-prop-displaytitle": "Adds the title of the parsed wikitext.",
 +	"apihelp-parse-paramvalue-prop-headitems": "Gives items to put in the <code>&lt;head&gt;</code> of the page.",
 +	"apihelp-parse-paramvalue-prop-headhtml": "Gives parsed <code>&lt;head&gt;</code> of the page.",
 +	"apihelp-parse-paramvalue-prop-modules": "Gives the ResourceLoader modules used on the page.",
 +	"apihelp-parse-paramvalue-prop-jsconfigvars": "Gives the JavaScript configuration variables specific to the page.",
 +	"apihelp-parse-paramvalue-prop-encodedjsconfigvars": "Gives the JavaScript configuration variables specific to the page as a JSON string.",
 +	"apihelp-parse-paramvalue-prop-indicators": "Gives the HTML of page status indicators used on the page.",
 +	"apihelp-parse-paramvalue-prop-iwlinks": "Gives interwiki links in the parsed wikitext.",
 +	"apihelp-parse-paramvalue-prop-wikitext": "Gives the original wikitext that was parsed.",
 +	"apihelp-parse-paramvalue-prop-properties": "Gives various properties defined in the parsed wikitext.",
 +	"apihelp-parse-paramvalue-prop-limitreportdata": "Gives the limit report in a structured way. Gives no data, when <var>$1disablepp</var> is set.",
 +	"apihelp-parse-paramvalue-prop-limitreporthtml": "Gives the HTML version of the limit report. Gives no data, when <var>$1disablepp</var> is set.",
  	"apihelp-parse-param-pst": "Do a pre-save transform on the input before parsing it. Only valid when used with text.",
  	"apihelp-parse-param-onlypst": "Do a pre-save transform (PST) on the input, but don't parse it. Returns the same wikitext, after a PST has been applied. Only valid when used with <var>$1text</var>.",
  	"apihelp-parse-param-effectivelanglinks": "Includes language links supplied by extensions (for use with <kbd>$1prop=langlinks</kbd>).",
@@@ -1064,7 -1043,7 +1065,7 @@@
  	"apihelp-undelete-example-page": "Undelete page <kbd>Main Page</kbd>.",
  	"apihelp-undelete-example-revisions": "Undelete two revisions of page <kbd>Main Page</kbd>.",
  
 -	"apihelp-upload-description": "Upload a file, or get the status of pending uploads.\n\nSeveral methods are available:\n* Upload file contents directly, using the <var>$1file</var> parameter.\n* Upload the file in pieces, using the <var>$1filesize</var>, <var>$1chunk</var>, and <var>$1offset</var> parameters.* Have the MediaWiki server fetch a file from a URL, using the <var>$1url</var> parameter.\n* Complete an earlier upload that failed due to warnings, using the <var>$1filekey</var> parameter.\nNote that the HTTP POST must be done as a file upload (i.e. using <code>multipart/form-data</code>) when sending the <var>$1file</var>.",
 +	"apihelp-upload-description": "Upload a file, or get the status of pending uploads.\n\nSeveral methods are available:\n* Upload file contents directly, using the <var>$1file</var> parameter.\n* Upload the file in pieces, using the <var>$1filesize</var>, <var>$1chunk</var>, and <var>$1offset</var> parameters.\n* Have the MediaWiki server fetch a file from a URL, using the <var>$1url</var> parameter.\n* Complete an earlier upload that failed due to warnings, using the <var>$1filekey</var> parameter.\nNote that the HTTP POST must be done as a file upload (i.e. using <code>multipart/form-data</code>) when sending the <var>$1file</var>.",
  	"apihelp-upload-param-filename": "Target filename.",
  	"apihelp-upload-param-comment": "Upload comment. Also used as the initial page text for new files if <var>$1text</var> is not specified.",
  	"apihelp-upload-param-text": "Initial page text for new files.",
@@@ -1167,7 -1146,7 +1168,7 @@@
  	"api-help-param-deprecated": "Deprecated.",
  	"api-help-param-required": "This parameter is required.",
  	"api-help-datatypes-header": "Data types",
 -	"api-help-datatypes": "Some API parameter types need further explanation:\n;boolean\n:Boolean parameters work like HTML checkboxes: if the parameter is specified, regardless of value, it is considered true. For a false value, omit the parameter entirely.\n;timestamp\n:Timestamps may be specified in several formats. ISO 8601 date and time is recommended. All times are in UTC, any included timezone is ignored.\n:* ISO 8601 date and time, <kbd><var>2001</var>-<var>01</var>-<var>15</var>T<var>14</var>:<var>56</var>:<var>00</var>Z</kbd> (punctuation and <kbd>Z</kbd> are optional)\n:* ISO 8601 date and time with (ignored) fractional seconds, <kbd><var>2001</var>-<var>01</var>-<var>15</var>T<var>14</var>:<var>56</var>:<var>00</var>.<var>00001</var>Z</kbd> (dashes, colons, and <kbd>Z</kbd> are optional)\n:* MediaWiki format, <kbd><var>2001</var><var>01</var><var>15</var><var>14</var><var>56</var><var>00</var></kbd>\n:* Generic numeric format, <kbd><var>2001</var>-<var>01</var>-<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd> (optional timezone of <kbd>GMT</kbd>, <kbd>+<var>##</var></kbd>, or <kbd>-<var>##</var></kbd> is ignored)\n:* EXIF format, <kbd><var>2001</var>:<var>01</var>:<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:*RFC 2822 format (timezone may be omitted), <kbd><var>Mon</var>, <var>15</var> <var>Jan</var> <var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* RFC 850 format (timezone may be omitted), <kbd><var>Monday</var>, <var>15</var>-<var>Jan</var>-<var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* C ctime format, <kbd><var>Mon</var> <var>Jan</var> <var>15</var> <var>14</var>:<var>56</var>:<var>00</var> <var>2001</var></kbd>\n:* Seconds since 1970-01-01T00:00:00Z as a 1 to 13 digit integer",
 +	"api-help-datatypes": "Some parameter types in API requests need further explanation:\n;boolean\n:Boolean parameters work like HTML checkboxes: if the parameter is specified, regardless of value, it is considered true. For a false value, omit the parameter entirely.\n;timestamp\n:Timestamps may be specified in several formats. ISO 8601 date and time is recommended. All times are in UTC, any included timezone is ignored.\n:* ISO 8601 date and time, <kbd><var>2001</var>-<var>01</var>-<var>15</var>T<var>14</var>:<var>56</var>:<var>00</var>Z</kbd> (punctuation and <kbd>Z</kbd> are optional)\n:* ISO 8601 date and time with (ignored) fractional seconds, <kbd><var>2001</var>-<var>01</var>-<var>15</var>T<var>14</var>:<var>56</var>:<var>00</var>.<var>00001</var>Z</kbd> (dashes, colons, and <kbd>Z</kbd> are optional)\n:* MediaWiki format, <kbd><var>2001</var><var>01</var><var>15</var><var>14</var><var>56</var><var>00</var></kbd>\n:* Generic numeric format, <kbd><var>2001</var>-<var>01</var>-<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd> (optional timezone of <kbd>GMT</kbd>, <kbd>+<var>##</var></kbd>, or <kbd>-<var>##</var></kbd> is ignored)\n:* EXIF format, <kbd><var>2001</var>:<var>01</var>:<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:*RFC 2822 format (timezone may be omitted), <kbd><var>Mon</var>, <var>15</var> <var>Jan</var> <var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* RFC 850 format (timezone may be omitted), <kbd><var>Monday</var>, <var>15</var>-<var>Jan</var>-<var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* C ctime format, <kbd><var>Mon</var> <var>Jan</var> <var>15</var> <var>14</var>:<var>56</var>:<var>00</var> <var>2001</var></kbd>\n:* Seconds since 1970-01-01T00:00:00Z as a 1 to 13 digit integer",
  	"api-help-param-type-limit": "Type: integer or <kbd>max</kbd>",
  	"api-help-param-type-integer": "Type: {{PLURAL:$1|1=integer|2=list of integers}}",
  	"api-help-param-type-boolean": "Type: boolean ([[Special:ApiHelp/main#main/datatypes|details]])",
diff --combined includes/api/i18n/qqq.json
index 4e9aafe844,8d3fcc764a..1398afdc3a
--- a/includes/api/i18n/qqq.json
+++ b/includes/api/i18n/qqq.json
@@@ -7,8 -7,7 +7,8 @@@
  			"Umherirrender",
  			"McDutchie",
  			"Raymond",
 -			"Anomie"
 +			"Anomie",
 +			"Nemo bis"
  		]
  	},
  	"apihelp-main-description": "{{doc-apihelp-description|main}}",
@@@ -225,6 -224,7 +225,7 @@@
  	"apihelp-opensearch-param-suggest": "{{doc-apihelp-param|opensearch|suggest}}",
  	"apihelp-opensearch-param-redirects": "{{doc-apihelp-param|opensearch|redirects}}",
  	"apihelp-opensearch-param-format": "{{doc-apihelp-param|opensearch|format}}",
+ 	"apihelp-opensearch-param-warningsaserror": "{{doc-apihelp-param|opensearch|warningsaserror}}",
  	"apihelp-opensearch-example-te": "{{doc-apihelp-example|opensearch}}",
  	"apihelp-options-description": "{{doc-apihelp-description|options}}",
  	"apihelp-options-param-reset": "{{doc-apihelp-param|options|reset}}",
@@@ -251,29 -251,7 +252,29 @@@
  	"apihelp-parse-param-pageid": "{{doc-apihelp-param|parse|pageid}}",
  	"apihelp-parse-param-redirects": "{{doc-apihelp-param|parse|redirects}}",
  	"apihelp-parse-param-oldid": "{{doc-apihelp-param|parse|oldid}}",
 -	"apihelp-parse-param-prop": "{{doc-apihelp-param|parse|prop}}",
 +	"apihelp-parse-param-prop": "{{doc-apihelp-param|parse|prop|paramvalues=1}}",
 +	"apihelp-parse-paramvalue-prop-text": "{{doc-apihelp-paramvalue|parse|prop|text}}",
 +	"apihelp-parse-paramvalue-prop-langlinks": "{{doc-apihelp-paramvalue|parse|prop|langlinks}}",
 +	"apihelp-parse-paramvalue-prop-categories": "{{doc-apihelp-paramvalue|parse|prop|categories}}",
 +	"apihelp-parse-paramvalue-prop-categorieshtml": "{{doc-apihelp-paramvalue|parse|prop|categorieshtml}}",
 +	"apihelp-parse-paramvalue-prop-links": "{{doc-apihelp-paramvalue|parse|prop|links}}",
 +	"apihelp-parse-paramvalue-prop-templates": "{{doc-apihelp-paramvalue|parse|prop|templates}}",
 +	"apihelp-parse-paramvalue-prop-images": "{{doc-apihelp-paramvalue|parse|prop|images}}",
 +	"apihelp-parse-paramvalue-prop-externallinks": "{{doc-apihelp-paramvalue|parse|prop|externallinks}}",
 +	"apihelp-parse-paramvalue-prop-sections": "{{doc-apihelp-paramvalue|parse|prop|sections}}",
 +	"apihelp-parse-paramvalue-prop-revid": "{{doc-apihelp-paramvalue|parse|prop|revid}}",
 +	"apihelp-parse-paramvalue-prop-displaytitle": "{{doc-apihelp-paramvalue|parse|prop|displaytitle}}",
 +	"apihelp-parse-paramvalue-prop-headitems": "{{doc-apihelp-paramvalue|parse|prop|headitems}}",
 +	"apihelp-parse-paramvalue-prop-headhtml": "{{doc-apihelp-paramvalue|parse|prop|headhtml}}",
 +	"apihelp-parse-paramvalue-prop-modules": "{{doc-apihelp-paramvalue|parse|prop|modules}}",
 +	"apihelp-parse-paramvalue-prop-jsconfigvars": "{{doc-apihelp-paramvalue|parse|prop|jsconfigvars}}",
 +	"apihelp-parse-paramvalue-prop-encodedjsconfigvars": "{{doc-apihelp-paramvalue|parse|prop|encodedjsconfigvars}}",
 +	"apihelp-parse-paramvalue-prop-indicators": "{{doc-apihelp-paramvalue|parse|prop|indicators}}",
 +	"apihelp-parse-paramvalue-prop-iwlinks": "{{doc-apihelp-paramvalue|parse|prop|iwlinks}}",
 +	"apihelp-parse-paramvalue-prop-wikitext": "{{doc-apihelp-paramvalue|parse|prop|wikitext}}",
 +	"apihelp-parse-paramvalue-prop-properties": "{{doc-apihelp-paramvalue|parse|prop|properties}}",
 +	"apihelp-parse-paramvalue-prop-limitreportdata": "{{doc-apihelp-paramvalue|parse|prop|limitreportdata}}",
 +	"apihelp-parse-paramvalue-prop-limitreporthtml": "{{doc-apihelp-paramvalue|parse|prop|limitreporthtml}}",
  	"apihelp-parse-param-pst": "{{doc-apihelp-param|parse|pst}}",
  	"apihelp-parse-param-onlypst": "{{doc-apihelp-param|parse|onlypst}}",
  	"apihelp-parse-param-effectivelanglinks": "{{doc-apihelp-param|parse|effectivelanglinks}}",
@@@ -405,7 -383,7 +406,7 @@@
  	"apihelp-query+allmessages-param-includelocal": "{{doc-apihelp-param|query+allmessages|includelocal}}",
  	"apihelp-query+allmessages-param-args": "{{doc-apihelp-param|query+allmessages|args}}",
  	"apihelp-query+allmessages-param-filter": "{{doc-apihelp-param|query+allmessages|filter}}",
 -	"apihelp-query+allmessages-param-customised": "{{doc-apihelp-param|query+allmessages|customised}}",
 +	"apihelp-query+allmessages-param-customised": "\"Customisation state\" means the choice made by the user to only list locally customised system messages or not.\n----\n{{doc-apihelp-param|query+allmessages|customised}}",
  	"apihelp-query+allmessages-param-lang": "{{doc-apihelp-param|query+allmessages|lang}}",
  	"apihelp-query+allmessages-param-from": "{{doc-apihelp-param|query+allmessages|from}}",
  	"apihelp-query+allmessages-param-to": "{{doc-apihelp-param|query+allmessages|to}}",