From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 27 Dec 2014 15:41:37 +0100 Subject: Update to MediaWiki 1.24.1 --- includes/content/WikitextContent.php | 175 +++++++++++++++++++++++------------ 1 file changed, 115 insertions(+), 60 deletions(-) (limited to 'includes/content/WikitextContent.php') diff --git a/includes/content/WikitextContent.php b/includes/content/WikitextContent.php index 26337db9..9a8ab3a6 100644 --- a/includes/content/WikitextContent.php +++ b/includes/content/WikitextContent.php @@ -31,31 +31,43 @@ * @ingroup Content */ class WikitextContent extends TextContent { + private $redirectTargetAndText = null; public function __construct( $text ) { parent::__construct( $text, CONTENT_MODEL_WIKITEXT ); } /** + * @param string|number $sectionId + * + * @return Content|bool|null + * * @see Content::getSection() */ - public function getSection( $section ) { + public function getSection( $sectionId ) { global $wgParser; $text = $this->getNativeData(); - $sect = $wgParser->getSection( $text, $section, false ); + $sect = $wgParser->getSection( $text, $sectionId, false ); if ( $sect === false ) { return false; } else { - return new WikitextContent( $sect ); + return new static( $sect ); } } /** + * @param string|number|null|bool $sectionId + * @param Content $with + * @param string $sectionTitle + * + * @throws MWException + * @return Content + * * @see Content::replaceSection() */ - public function replaceSection( $section, Content $with, $sectionTitle = '' ) { + public function replaceSection( $sectionId, Content $with, $sectionTitle = '' ) { wfProfileIn( __METHOD__ ); $myModelId = $this->getModel(); @@ -71,13 +83,16 @@ class WikitextContent extends TextContent { $oldtext = $this->getNativeData(); $text = $with->getNativeData(); - if ( $section === '' ) { + if ( strval( $sectionId ) === '' ) { wfProfileOut( __METHOD__ ); + return $with; # XXX: copy first? - } if ( $section == 'new' ) { + } + + if ( $sectionId === 'new' ) { # Inserting a new section $subject = $sectionTitle ? wfMessage( 'newsectionheaderdefaultlevel' ) - ->rawParams( $sectionTitle )->inContentLanguage()->text() . "\n\n" : ''; + ->rawParams( $sectionTitle )->inContentLanguage()->text() . "\n\n" : ''; if ( wfRunHooks( 'PlaceNewSection', array( $this, $oldtext, $subject, &$text ) ) ) { $text = strlen( trim( $oldtext ) ) > 0 ? "{$oldtext}\n\n{$subject}{$text}" @@ -87,12 +102,13 @@ class WikitextContent extends TextContent { # Replacing an existing section; roll out the big guns global $wgParser; - $text = $wgParser->replaceSection( $oldtext, $section, $text ); + $text = $wgParser->replaceSection( $oldtext, $sectionId, $text ); } - $newContent = new WikitextContent( $text ); + $newContent = new static( $text ); wfProfileOut( __METHOD__ ); + return $newContent; } @@ -100,7 +116,8 @@ class WikitextContent extends TextContent { * Returns a new WikitextContent object with the given section heading * prepended. * - * @param $header string + * @param string $header + * * @return Content */ public function addSectionHeader( $header ) { @@ -109,16 +126,17 @@ class WikitextContent extends TextContent { $text .= "\n\n"; $text .= $this->getNativeData(); - return new WikitextContent( $text ); + return new static( $text ); } /** * Returns a Content object with pre-save transformations applied using * Parser::preSaveTransform(). * - * @param $title Title - * @param $user User - * @param $popts ParserOptions + * @param Title $title + * @param User $user + * @param ParserOptions $popts + * * @return Content */ public function preSaveTransform( Title $title, User $user, ParserOptions $popts ) { @@ -128,50 +146,58 @@ class WikitextContent extends TextContent { $pst = $wgParser->preSaveTransform( $text, $title, $user, $popts ); rtrim( $pst ); - return ( $text === $pst ) ? $this : new WikitextContent( $pst ); + return ( $text === $pst ) ? $this : new static( $pst ); } /** * Returns a Content object with preload transformations applied (or this * object if no transformations apply). * - * @param $title Title - * @param $popts ParserOptions + * @param Title $title + * @param ParserOptions $popts + * @param array $params + * * @return Content */ - public function preloadTransform( Title $title, ParserOptions $popts ) { + public function preloadTransform( Title $title, ParserOptions $popts, $params = array() ) { global $wgParser; $text = $this->getNativeData(); - $plt = $wgParser->getPreloadText( $text, $title, $popts ); + $plt = $wgParser->getPreloadText( $text, $title, $popts, $params ); - return new WikitextContent( $plt ); + return new static( $plt ); } /** - * Implement redirect extraction for wikitext. + * Extract the redirect target and the remaining text on the page. * - * @return null|Title + * @note migrated here from Title::newFromRedirectInternal() * - * @note: migrated here from Title::newFromRedirectInternal() + * @since 1.23 * - * @see Content::getRedirectTarget - * @see AbstractContent::getRedirectTarget + * @return array List of two elements: Title|null and string. */ - public function getRedirectTarget() { + protected function getRedirectTargetAndText() { global $wgMaxRedirects; + + if ( $this->redirectTargetAndText !== null ) { + return $this->redirectTargetAndText; + } + if ( $wgMaxRedirects < 1 ) { // redirects are disabled, so quit early - return null; + $this->redirectTargetAndText = array( null, $this->getNativeData() ); + return $this->redirectTargetAndText; } + $redir = MagicWord::get( 'redirect' ); - $text = trim( $this->getNativeData() ); + $text = ltrim( $this->getNativeData() ); if ( $redir->matchStartAndRemove( $text ) ) { // Extract the first link and see if it's usable // Ensure that it really does come directly after #REDIRECT // Some older redirects included a colon, so don't freak about that! $m = array(); - if ( preg_match( '!^\s*:?\s*\[{2}(.*?)(?:\|.*?)?\]{2}!', $text, $m ) ) { + if ( preg_match( '!^\s*:?\s*\[{2}(.*?)(?:\|.*?)?\]{2}\s*!', $text, $m ) ) { // Strip preceding colon used to "escape" categories, etc. // and URL-decode links if ( strpos( $m[1], '%' ) !== false ) { @@ -181,17 +207,33 @@ class WikitextContent extends TextContent { $title = Title::newFromText( $m[1] ); // If the title is a redirect to bad special pages or is invalid, return null if ( !$title instanceof Title || !$title->isValidRedirectTarget() ) { - return null; + $this->redirectTargetAndText = array( null, $this->getNativeData() ); + return $this->redirectTargetAndText; } - return $title; + + $this->redirectTargetAndText = array( $title, substr( $text, strlen( $m[0] ) ) ); + return $this->redirectTargetAndText; } } - return null; + + $this->redirectTargetAndText = array( null, $this->getNativeData() ); + return $this->redirectTargetAndText; } /** - * @see Content::updateRedirect() + * Implement redirect extraction for wikitext. * + * @return Title|null + * + * @see Content::getRedirectTarget + */ + public function getRedirectTarget() { + list( $title, ) = $this->getRedirectTargetAndText(); + + return $title; + } + + /** * This implementation replaces the first link on the page with the given new target * if this Content object is a redirect. Otherwise, this method returns $this. * @@ -199,7 +241,9 @@ class WikitextContent extends TextContent { * * @param Title $target * - * @return Content a new Content object with the updated redirect (or $this if this Content object isn't a redirect) + * @return Content + * + * @see Content::updateRedirect() */ public function updateRedirect( Title $target ) { if ( !$this->isRedirect() ) { @@ -213,21 +257,19 @@ class WikitextContent extends TextContent { '[[' . $target->getFullText() . ']]', $this->getNativeData(), 1 ); - return new WikitextContent( $newText ); + return new static( $newText ); } /** * Returns true if this content is not a redirect, and this content's text * is countable according to the criteria defined by $wgArticleCountMethod. * - * @param bool $hasLinks if it is known whether this content contains + * @param bool $hasLinks If it is known whether this content contains * links, provide this information here, to avoid redundant parsing to * find out (default: null). - * @param $title Title: (default: null) - * - * @internal param \IContextSource $context context for parsing if necessary + * @param Title $title Optional title, defaults to the title from the current main request. * - * @return bool True if the content is countable + * @return bool */ public function isCountable( $hasLinks = null, Title $title = null ) { global $wgArticleCountMethod; @@ -261,6 +303,10 @@ class WikitextContent extends TextContent { return false; } + /** + * @param int $maxlength + * @return string + */ public function getTextForSummary( $maxlength = 250 ) { $truncatedtext = parent::getTextForSummary( $maxlength ); @@ -276,31 +322,39 @@ class WikitextContent extends TextContent { * Returns a ParserOutput object resulting from parsing the content's text * using $wgParser. * - * @since 1.21 - * - * @param $title Title + * @param Title $title * @param int $revId Revision to pass to the parser (default: null) - * @param $options ParserOptions (default: null) - * @param bool $generateHtml (default: false) - * - * @internal param \IContextSource|null $context - * @return ParserOutput representing the HTML form of the text + * @param ParserOptions $options (default: null) + * @param bool $generateHtml (default: true) + * @param ParserOutput &$output ParserOutput representing the HTML form of the text, + * may be manipulated or replaced. */ - public function getParserOutput( Title $title, - $revId = null, - ParserOptions $options = null, $generateHtml = true + protected function fillParserOutput( Title $title, $revId, + ParserOptions $options, $generateHtml, ParserOutput &$output ) { global $wgParser; - if ( !$options ) { - //NOTE: use canonical options per default to produce cacheable output - $options = $this->getContentHandler()->makeParserOptions( 'canonical' ); + list( $redir, $text ) = $this->getRedirectTargetAndText(); + $output = $wgParser->parse( $text, $title, $options, true, true, $revId ); + + // Add redirect indicator at the top + if ( $redir ) { + // Make sure to include the redirect link in pagelinks + $output->addLink( $redir ); + if ( $generateHtml ) { + $chain = $this->getRedirectChain(); + $output->setText( + Article::getRedirectHeaderHtml( $title->getPageLanguage(), $chain, false ) . + $output->getText() + ); + $output->addModuleStyles( 'mediawiki.action.view.redirectPage' ); + } } - - $po = $wgParser->parse( $this->getNativeData(), $title, $options, true, true, $revId ); - return $po; } + /** + * @throws MWException + */ protected function getHtml() { throw new MWException( "getHtml() not implemented for wikitext. " @@ -309,15 +363,16 @@ class WikitextContent extends TextContent { } /** - * @see Content::matchMagicWord() - * * This implementation calls $word->match() on the this TextContent object's text. * * @param MagicWord $word * - * @return bool whether this Content object matches the given magic word. + * @return bool + * + * @see Content::matchMagicWord() */ public function matchMagicWord( MagicWord $word ) { return $word->match( $this->getNativeData() ); } + } -- cgit v1.2.3-54-g00ecf