jenkins-bot has submitted this change and it was merged.
Change subject: Remove support for api.php?action=parse&mobileformat=wml
......................................................................
Remove support for api.php?action=parse&mobileformat=wml
It's messy and unused.
Instead, return HTML and set warning.
Change-Id: I4b87ae34e9ff7d11fa834dee1a2571d4f06d2454
---
M includes/api/ApiParseExtender.php
M tests/ApiParseExtenderTest.php
2 files changed, 3 insertions(+), 13 deletions(-)
Approvals:
awjrichards: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiParseExtender.php
b/includes/api/ApiParseExtender.php
index 1298b5b..bd4e9bb 100644
--- a/includes/api/ApiParseExtender.php
+++ b/includes/api/ApiParseExtender.php
@@ -72,18 +72,10 @@
$title = Title::newFromText(
$data['parse']['title'] );
$html = MobileFormatter::wrapHTML(
$data['parse']['text']['*'] );
if ( MobileContext::parseContentFormat(
$params['mobileformat'] ) === 'WML' ) {
- $context = new WmlContext();
- $context->setCurrentUrl(
$title->getCanonicalURL() );
- $context->setRequestedSegment( isset(
$params['section'] )
- ? $params['section'] +
1 // Segment numbers start from 1
- : 0
- );
- $context->setUseFormat( 'wml' ); //
Force WML links just in case
- $context->setOnlyThisSegment( isset(
$params['section'] ) );
- $mf = new MobileFormatterWML( $html,
$title, $context );
- } else {
- $mf = new MobileFormatterHTML( $html,
$title );
+ // @todo: make mobileformat accept only
HTML on July 25, 2013
+ $module->setWarning( 'mobileformat=wml
is not supported anymore' );
}
+ $mf = new MobileFormatterHTML( $html, $title );
$mf->removeImages( $params['noimages'] );
$mf->setIsMainPage( $params['mainpage'] );
$mf->enableExpandableSections(
!$params['mainpage'] );
diff --git a/tests/ApiParseExtenderTest.php b/tests/ApiParseExtenderTest.php
index e5cc941..6a770c3 100644
--- a/tests/ApiParseExtenderTest.php
+++ b/tests/ApiParseExtenderTest.php
@@ -49,8 +49,6 @@
return array(
array( array( 'mobileformat' => 'html', 'text' => "I
exist\n\n<span class='nomobile'>I don't</span>" ),
"<p>I exist\n</p><p></p>" ),
- array( array( 'mobileformat' => 'wml', 'text' => 'I am
<span class="nomobile">not</span> a <span>span</span>' ),
- "<card id='s0' title='API'><p><p>I am a
span</p>\n</p><p>1/1</p></card>" ),
);
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/70320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b87ae34e9ff7d11fa834dee1a2571d4f06d2454
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: awjrichards <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
