wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-29 16:44:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "ApiVisualEditorEdit: Make tryDeflate public and static"

Browse source
This commit is contained in:
jenkins-bot 2017-09-14 22:00:27 +00:00 committed by Gerrit Code Review
parent 253d0b2e09 0b0d8d6266
commit a53971681f
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ApiVisualEditorEdit.php
View file

@ -118,14 +118,19 @@ class ApiVisualEditorEdit extends ApiVisualEditor {
];
}
protected function tryDeflate( $content ) {
public static function tryDeflate( $content ) {
if ( substr( $content, 0, 11 ) === 'rawdeflate,' ) {
$deflated = base64_decode( substr( $content, 11 ) );
MediaWiki\suppressWarnings();
$inflated = gzinflate( $deflated );
MediaWiki\restoreWarnings();
if ( $deflated === $inflated || $inflated === false ) {
$this->dieWithError( 'apierror-visualeditor-invaliddeflate', 'invaliddeflate' );
// Static equivalent of $this->dieWithError
throw ApiUsageException::newWithMessage(
null,
'apierror-visualeditor-invaliddeflate',
'invaliddeflate'
);
}
return $inflated;
}
@ -147,7 +152,7 @@ class ApiVisualEditorEdit extends ApiVisualEditor {
protected function getWikitextNoCache( $title, $params, $parserParams ) {
$this->requireOnlyOneParameter( $params, 'html' );
$wikitext = $this->postHTML(
$title, $this->tryDeflate( $params['html'] ), $parserParams, $params['etag']
$title, self::tryDeflate( $params['html'] ), $parserParams, $params['etag']
);
if ( $wikitext === false ) {
$this->dieWithError( 'apierror-visualeditor-docserver', 'docserver' );