From 7db9491d8969a60c9f9e4d93f8bac1bd4184f0d5 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 5 Oct 2012 15:03:24 +0200 Subject: [PATCH] set mediawiki version number Change-Id: I3479776bd3bb25c4d75d07e62ede2ad989025c5b --- includes/Article.php | 16 +++---- includes/EditPage.php | 24 +++++------ includes/Import.php | 2 +- includes/Revision.php | 14 +++--- includes/Title.php | 6 +-- includes/WikiPage.php | 46 ++++++++++---------- includes/content/AbstractContent.php | 10 ++--- includes/content/Content.php | 58 ++++++++++++------------- includes/content/ContentHandler.php | 60 +++++++++++++------------- includes/content/CssContent.php | 2 +- includes/content/JavaScriptContent.php | 2 +- includes/content/MessageContent.php | 2 +- includes/content/TextContent.php | 4 +- includes/content/WikitextContent.php | 6 +-- includes/diff/DifferenceEngine.php | 12 +++--- includes/installer/Ibm_db2Updater.php | 2 +- includes/installer/MysqlUpdater.php | 2 +- includes/installer/OracleUpdater.php | 2 +- includes/installer/SqliteUpdater.php | 2 +- 19 files changed, 136 insertions(+), 136 deletions(-) diff --git a/includes/Article.php b/includes/Article.php index 93e1dbf315..54d658cdde 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -65,7 +65,7 @@ class Article extends Page { /** * Content of the revision we are working on * @var Content - * @since 1.WD + * @since 1.21 */ var $mContentObject; // !< @@ -238,12 +238,12 @@ class Article extends Page { * This function has side effects! Do not use this function if you * only want the real revision text if any. * - * @deprecated in 1.WD; use getContentObject() instead + * @deprecated in 1.21; use getContentObject() instead * * @return string Return the text of this revision */ public function getContent() { - wfDeprecated( __METHOD__, '1.WD' ); + wfDeprecated( __METHOD__, '1.21' ); $content = $this->getContentObject(); return ContentHandler::getContentText( $content ); } @@ -261,7 +261,7 @@ class Article extends Page { * * @return Content Return the content of this revision * - * @since 1.WD + * @since 1.21 * * @todo: FIXME: this should really be protected, all callers should be changed to use WikiPage::getContent() instead. */ @@ -377,10 +377,10 @@ class Article extends Page { * uses this method to retrieve page text from the database, so the function has to remain public for now. * * @return mixed string containing article contents, or false if null - * @deprecated in 1.WD, use WikiPage::getContent() instead + * @deprecated in 1.21, use WikiPage::getContent() instead */ function fetchContent() { #BC cruft! - wfDeprecated( __METHOD__, '1.WD' ); + wfDeprecated( __METHOD__, '1.21' ); if ( $this->mContentLoaded && $this->mContent ) { return $this->mContent; @@ -408,7 +408,7 @@ class Article extends Page { * * @return Content|null * - * @since 1.WD + * @since 1.21 */ protected function fetchContentObject() { if ( $this->mContentLoaded ) { @@ -2051,7 +2051,7 @@ class Article extends Page { * @param $newtext * @param $flags * @return string - * @deprecated since 1.WD, use ContentHandler::getAutosummary() instead + * @deprecated since 1.21, use ContentHandler::getAutosummary() instead */ public static function getAutosummary( $oldtext, $newtext, $flags ) { return WikiPage::getAutosummary( $oldtext, $newtext, $flags ); diff --git a/includes/EditPage.php b/includes/EditPage.php index fe0e95eed7..461997f10a 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -805,11 +805,11 @@ class EditPage { * @param $def_text string * @return mixed string on success, $def_text for invalid sections * @private - * @deprecated since 1.WD + * @deprecated since 1.21 * @todo: deprecated, replace usage everywhere */ function getContent( $def_text = false ) { - wfDeprecated( __METHOD__, '1.WD' ); + wfDeprecated( __METHOD__, '1.21' ); if ( $def_text !== null && $def_text !== false && $def_text !== '' ) { $def_content = $this->toEditContent( $def_text ); @@ -956,7 +956,7 @@ class EditPage { * WikiPage::getContent( Revision::RAW ) except that when the page doesn't exist an empty * content object is returned instead of null. * - * @since 1.WD + * @since 1.21 * @return string */ private function getCurrentContent() { @@ -982,10 +982,10 @@ class EditPage { * Use this method before edit() to preload some text into the edit box * * @param $text string - * @deprecated since 1.WD + * @deprecated since 1.21 */ public function setPreloadedText( $text ) { - wfDeprecated( __METHOD__, "1.WD" ); + wfDeprecated( __METHOD__, "1.21" ); $content = $this->toEditContent( $text ); @@ -997,7 +997,7 @@ class EditPage { * * @param $content Content * - * @since 1.WD + * @since 1.21 */ public function setPreloadedContent( Content $content ) { $this->mPreloadedContent = $content; @@ -1011,10 +1011,10 @@ class EditPage { * * @return String * - * @deprecated since 1.WD, use getPreloadedContent() instead + * @deprecated since 1.21, use getPreloadedContent() instead */ protected function getPreloadedText( $preload ) { #NOTE: B/C only, replace usage! - wfDeprecated( __METHOD__, "1.WD" ); + wfDeprecated( __METHOD__, "1.21" ); $content = $this->getPreloadedContent( $preload ); $text = $this->toEditText( $content ); @@ -1030,7 +1030,7 @@ class EditPage { * * @return Content * - * @since 1.WD + * @since 1.21 */ protected function getPreloadedContent( $preload ) { #@todo: use this! global $wgUser; @@ -1632,10 +1632,10 @@ class EditPage { * @param $editText string * * @return bool - * @deprecated since 1.WD, use mergeChangesIntoContent() instead + * @deprecated since 1.21, use mergeChangesIntoContent() instead */ function mergeChangesInto( &$editText ){ - wfDebug( __METHOD__, "1.WD" ); + wfDebug( __METHOD__, "1.21" ); $editContent = $this->toEditContent( $editText ); @@ -1656,7 +1656,7 @@ class EditPage { * @parma $editText string * * @return bool - * @since since 1.WD + * @since since 1.21 */ private function mergeChangesIntoContent( &$editContent ){ wfProfileIn( __METHOD__ ); diff --git a/includes/Import.php b/includes/Import.php index 3035005569..27463821fa 100644 --- a/includes/Import.php +++ b/includes/Import.php @@ -1211,7 +1211,7 @@ class WikiRevision { /** * @return string * - * @deprecated Since 1.WD, use getContent() instead. + * @deprecated Since 1.21, use getContent() instead. */ function getText() { wfDeprecated( "Use getContent() instead." ); diff --git a/includes/Revision.php b/includes/Revision.php index 31a96adc2b..51e41d4cee 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -883,12 +883,12 @@ class Revision implements IDBAccessObject { * @param $user User object to check for, only if FOR_THIS_USER is passed * to the $audience parameter * - * @deprecated in 1.WD, use getContent() instead + * @deprecated in 1.21, use getContent() instead * @todo: replace usage in core * @return String */ public function getText( $audience = self::FOR_PUBLIC, User $user = null ) { - wfDeprecated( __METHOD__, '1.WD' ); + wfDeprecated( __METHOD__, '1.21' ); $content = $this->getContent( $audience, $user ); return ContentHandler::getContentText( $content ); # returns the raw content text, if applicable @@ -905,7 +905,7 @@ class Revision implements IDBAccessObject { * Revision::RAW get the text regardless of permissions * @param $user User object to check for, only if FOR_THIS_USER is passed * to the $audience parameter - * @since 1.WD + * @since 1.21 * @return Content */ public function getContent( $audience = self::FOR_PUBLIC, User $user = null ) { @@ -934,11 +934,11 @@ class Revision implements IDBAccessObject { * * @return String * - * @deprecated since 1.WD. Instead, use Revision::getContent( Revision::RAW ) + * @deprecated since 1.21. Instead, use Revision::getContent( Revision::RAW ) * or Revision::getSerializedData() as appropriate. */ public function getRawText() { - wfDeprecated( __METHOD__, "1.WD" ); + wfDeprecated( __METHOD__, "1.21" ); return $this->getText( self::RAW ); } @@ -946,7 +946,7 @@ class Revision implements IDBAccessObject { /** * Fetch original serialized data without regard for view restrictions * - * @since 1.WD + * @since 1.21 * @return String */ public function getSerializedData() { @@ -956,7 +956,7 @@ class Revision implements IDBAccessObject { /** * Gets the content object for the revision * - * @since 1.WD + * @since 1.21 * @return Content */ protected function getContentInternal() { diff --git a/includes/Title.php b/includes/Title.php index b9f432fd46..affffc3c68 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -384,7 +384,7 @@ class Title { * * @param $text String: Text with possible redirect * @return Title: The corresponding Title - * @deprecated since 1.WD, use Content::getRedirectTarget instead. + * @deprecated since 1.21, use Content::getRedirectTarget instead. */ public static function newFromRedirect( $text ) { $content = ContentHandler::makeContent( $text, null, CONTENT_MODEL_WIKITEXT ); @@ -399,7 +399,7 @@ class Title { * * @param $text String Text with possible redirect * @return Title - * @deprecated since 1.WD, use Content::getUltimateRedirectTarget instead. + * @deprecated since 1.21, use Content::getUltimateRedirectTarget instead. */ public static function newFromRedirectRecurse( $text ) { $content = ContentHandler::makeContent( $text, null, CONTENT_MODEL_WIKITEXT ); @@ -414,7 +414,7 @@ class Title { * * @param $text String Text with possible redirect * @return Array of Titles, with the destination last - * @deprecated since 1.WD, use Content::getRedirectChain instead. + * @deprecated since 1.21, use Content::getRedirectChain instead. */ public static function newFromRedirectArray( $text ) { $content = ContentHandler::makeContent( $text, null, CONTENT_MODEL_WIKITEXT ); diff --git a/includes/WikiPage.php b/includes/WikiPage.php index c6fced0b24..b1dd910d1c 100644 --- a/includes/WikiPage.php +++ b/includes/WikiPage.php @@ -198,7 +198,7 @@ class WikiPage extends Page implements IDBAccessObject { * * @return ContentHandler * - * @since 1.WD + * @since 1.21 */ public function getContentHandler() { return ContentHandler::getForModelID( $this->getContentModel() ); @@ -459,7 +459,7 @@ class WikiPage extends Page implements IDBAccessObject { * * @return String * - * @since 1.WD + * @since 1.21 */ public function getContentModel() { if ( $this->exists() ) { @@ -606,7 +606,7 @@ class WikiPage extends Page implements IDBAccessObject { * Revision::RAW get the text regardless of permissions * @return Content|null The content of the current revision * - * @since 1.WD + * @since 1.21 */ public function getContent( $audience = Revision::FOR_PUBLIC ) { $this->loadLastEdit(); @@ -624,10 +624,10 @@ class WikiPage extends Page implements IDBAccessObject { * Revision::FOR_THIS_USER to be displayed to $wgUser * Revision::RAW get the text regardless of permissions * @return String|false The text of the current revision - * @deprecated as of 1.WD, getContent() should be used instead. + * @deprecated as of 1.21, getContent() should be used instead. */ public function getText( $audience = Revision::FOR_PUBLIC ) { #@todo: deprecated, replace usage! - wfDeprecated( __METHOD__, '1.WD' ); + wfDeprecated( __METHOD__, '1.21' ); $this->loadLastEdit(); if ( $this->mLastRevision ) { @@ -640,10 +640,10 @@ class WikiPage extends Page implements IDBAccessObject { * Get the text of the current revision. No side-effects... * * @return String|bool The text of the current revision. False on failure - * @deprecated as of 1.WD, getContent() should be used instead. + * @deprecated as of 1.21, getContent() should be used instead. */ public function getRawText() { - wfDeprecated( __METHOD__, '1.WD' ); + wfDeprecated( __METHOD__, '1.21' ); return $this->getText( Revision::RAW ); } @@ -1352,7 +1352,7 @@ class WikiPage extends Page implements IDBAccessObject { * @param $undo Revision * @param $undoafter Revision Must be an earlier revision than $undo * @return mixed string on success, false on failure - * @since 1.WD + * @since 1.21 * Before we had the Content object, this was done in getUndoText */ public function getUndoContent( Revision $undo, Revision $undoafter = null ) { @@ -1367,10 +1367,10 @@ class WikiPage extends Page implements IDBAccessObject { * @param $undo Revision * @param $undoafter Revision Must be an earlier revision than $undo * @return mixed string on success, false on failure - * @deprecated since 1.WD: use ContentHandler::getUndoContent() instead. + * @deprecated since 1.21: use ContentHandler::getUndoContent() instead. */ public function getUndoText( Revision $undo, Revision $undoafter = null ) { - wfDeprecated( __METHOD__, '1.WD' ); + wfDeprecated( __METHOD__, '1.21' ); $this->loadLastEdit(); @@ -1399,10 +1399,10 @@ class WikiPage extends Page implements IDBAccessObject { * @param $edittime String: revision timestamp or null to use the current revision * @return String new complete article text, or null if error * - * @deprecated since 1.WD, use replaceSectionContent() instead + * @deprecated since 1.21, use replaceSectionContent() instead */ public function replaceSection( $section, $text, $sectionTitle = '', $edittime = null ) { - wfDeprecated( __METHOD__, '1.WD' ); + wfDeprecated( __METHOD__, '1.21' ); if ( strval( $section ) == '' ) { //NOTE: keep condition in sync with condition in replaceSectionContent! // Whole-page edit; let the whole text through @@ -1441,7 +1441,7 @@ class WikiPage extends Page implements IDBAccessObject { * * @return Content new complete article content, or null if error * - * @since 1.WD + * @since 1.21 */ public function replaceSectionContent( $section, Content $sectionContent, $sectionTitle = '', $edittime = null ) { wfProfileIn( __METHOD__ ); @@ -1547,10 +1547,10 @@ class WikiPage extends Page implements IDBAccessObject { * * Compatibility note: this function previously returned a boolean value indicating success/failure * - * @deprecated since 1.WD: use doEditContent() instead. + * @deprecated since 1.21: use doEditContent() instead. */ public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) { - wfDeprecated( __METHOD__, '1.WD' ); + wfDeprecated( __METHOD__, '1.21' ); $content = ContentHandler::makeContent( $text, $this->getTitle() ); @@ -1602,7 +1602,7 @@ class WikiPage extends Page implements IDBAccessObject { * new: Boolean indicating if the function attempted to create a new article * revision: The revision object for the inserted revision, or null * - * @since 1.WD + * @since 1.21 */ public function doEditContent( Content $content, $summary, $flags = 0, $baseRevId = false, User $user = null, $serialisation_format = null ) { @@ -1920,10 +1920,10 @@ class WikiPage extends Page implements IDBAccessObject { * Prepare text which is about to be saved. * Returns a stdclass with source, pst and output members * - * @deprecated in 1.WD: use prepareContentForEdit instead. + * @deprecated in 1.21: use prepareContentForEdit instead. */ public function prepareTextForEdit( $text, $revid = null, User $user = null ) { - wfDeprecated( __METHOD__, '1.WD' ); + wfDeprecated( __METHOD__, '1.21' ); $content = ContentHandler::makeContent( $text, $this->getTitle() ); return $this->prepareContentForEdit( $content, $revid , $user ); } @@ -1939,7 +1939,7 @@ class WikiPage extends Page implements IDBAccessObject { * * @return bool|object * - * @since 1.WD + * @since 1.21 */ public function prepareContentForEdit( Content $content, $revid = null, User $user = null, $serialization_format = null ) { global $wgParser, $wgContLang, $wgUser; @@ -2122,10 +2122,10 @@ class WikiPage extends Page implements IDBAccessObject { * @param $comment String: comment submitted * @param $minor Boolean: whereas it's a minor modification * - * @deprecated since 1.WD, use doEditContent() instead. + * @deprecated since 1.21, use doEditContent() instead. */ public function doQuickEdit( $text, User $user, $comment = '', $minor = 0 ) { - wfDeprecated( __METHOD__, "1.WD" ); + wfDeprecated( __METHOD__, "1.21" ); $content = ContentHandler::makeContent( $text, $this->getTitle() ); return $this->doQuickEditContent( $content, $user, $comment , $minor ); @@ -2921,12 +2921,12 @@ class WikiPage extends Page implements IDBAccessObject { * @param $flags Int bitmask: a bitmask of flags submitted for the edit. * @return string An appropriate autosummary, or an empty string. * - * @deprecated since 1.WD, use ContentHandler::getAutosummary() instead + * @deprecated since 1.21, use ContentHandler::getAutosummary() instead */ public static function getAutosummary( $oldtext, $newtext, $flags ) { # NOTE: stub for backwards-compatibility. assumes the given text is wikitext. will break horribly if it isn't. - wfDeprecated( __METHOD__, '1.WD' ); + wfDeprecated( __METHOD__, '1.21' ); $handler = ContentHandler::getForModelID( CONTENT_MODEL_WIKITEXT ); $oldContent = is_null( $oldtext ) ? null : $handler->unserializeContent( $oldtext ); diff --git a/includes/content/AbstractContent.php b/includes/content/AbstractContent.php index c65f11c389..7511ec9857 100644 --- a/includes/content/AbstractContent.php +++ b/includes/content/AbstractContent.php @@ -3,7 +3,7 @@ * A content object represents page content, e.g. the text to show on a page. * Content objects have no knowledge about how they relate to Wiki pages. * - * @since 1.WD + * @since 1.21 */ abstract class AbstractContent implements Content { @@ -158,7 +158,7 @@ abstract class AbstractContent implements Content { * @return Array. A list of DataUpdate objects for putting information * about this content object somewhere. * - * @since WD.1 + * @since 1.21 */ public function getSecondaryDataUpdates( Title $title, Content $old = null, @@ -223,7 +223,7 @@ abstract class AbstractContent implements Content { /** * @see Content::isRedirect() * - * @since WD.1 + * @since 1.21 * * @return bool */ @@ -236,7 +236,7 @@ abstract class AbstractContent implements Content { * * This default implementation always returns $this. * - * @since WD.1 + * @since 1.21 * * @return Content $this */ @@ -293,7 +293,7 @@ abstract class AbstractContent implements Content { /** * @see Content::getDeletionUpdates() * - * @since WD.1 + * @since 1.21 * * @param $page \WikiPage the deleted page * @param $parserOutput null|\ParserOutput optional parser output object diff --git a/includes/content/Content.php b/includes/content/Content.php index 323b40a790..a972e67f1c 100644 --- a/includes/content/Content.php +++ b/includes/content/Content.php @@ -3,12 +3,12 @@ * A content object represents page content, e.g. the text to show on a page. * Content objects have no knowledge about how they relate to wiki pages. * - * @since 1.WD + * @since 1.21 */ interface Content { /** - * @since WD.1 + * @since 1.21 * * @return string A string representing the content in a way useful for * building a full text search index. If no useful representation exists, @@ -20,7 +20,7 @@ interface Content { public function getTextForSearchIndex( ); /** - * @since WD.1 + * @since 1.21 * * @return string The wikitext to include when another page includes this * content, or false if the content is not includable in a wikitext page. @@ -37,7 +37,7 @@ interface Content { * Returns a textual representation of the content suitable for use in edit * summaries and log messages. * - * @since WD.1 + * @since 1.21 * * @param $maxlength int Maximum length of the summary text * @return The summary text @@ -48,7 +48,7 @@ interface Content { * Returns native representation of the data. Interpretation depends on * the data model used, as given by getDataModel(). * - * @since WD.1 + * @since 1.21 * * @return mixed The native representation of the content. Could be a * string, a nested array structure, an object, a binary blob... @@ -69,7 +69,7 @@ interface Content { * Returns the ID of the content model used by this Content object. * Corresponds to the CONTENT_MODEL_XXX constants. * - * @since WD.1 + * @since 1.21 * * @return String The model id */ @@ -81,7 +81,7 @@ interface Content { * * Shorthand for ContentHandler::getForContent( $this ) * - * @since WD.1 + * @since 1.21 * * @return ContentHandler */ @@ -93,7 +93,7 @@ interface Content { * * Shorthand for $this->getContentHandler()->getDefaultFormat() * - * @since WD.1 + * @since 1.21 * * @return String */ @@ -105,7 +105,7 @@ interface Content { * * Shorthand for $this->getContentHandler()->getSupportedFormats() * - * @since WD.1 + * @since 1.21 * * @return Array of supported serialization formats */ @@ -120,7 +120,7 @@ interface Content { * * Shorthand for $this->getContentHandler()->isSupportedFormat( $format ) * - * @since WD.1 + * @since 1.21 * * @param $format string The format to check * @return bool Whether the format is supported @@ -132,7 +132,7 @@ interface Content { * * Shorthand for $this->getContentHandler()->serializeContent( $this, $format ) * - * @since WD.1 + * @since 1.21 * * @param $format null|string The desired serialization format (or null for * the default format). @@ -143,7 +143,7 @@ interface Content { /** * Returns true if this Content object represents empty content. * - * @since WD.1 + * @since 1.21 * * @return bool Whether this Content object is empty */ @@ -157,7 +157,7 @@ interface Content { * * This default implementation always returns true. * - * @since WD.1 + * @since 1.21 * * @return boolean */ @@ -180,7 +180,7 @@ interface Content { * - $a->equals( $b ) <=> $b->equals( $a ) * - $a->equals( $b ) && $b->equals( $c ) ==> $a->equals( $c ) * - * @since WD.1 + * @since 1.21 * * @param $that Content The Content object to compare to * @return bool True if this Content object is equal to $that, false otherwise. @@ -201,7 +201,7 @@ interface Content { * should return $this. That is, $copy === $original may be true, but only * for immutable content objects. * - * @since WD.1 + * @since 1.21 * * @return Content. A copy of this object */ @@ -212,7 +212,7 @@ interface Content { * that it's also in a countable location (e.g. a current revision in the * main namespace). * - * @since WD.1 + * @since 1.21 * * @param $hasLinks Bool: If it is known whether this content contains * links, provide this information here, to avoid redundant parsing to @@ -235,7 +235,7 @@ interface Content { * the result of calling getText() on the ParserOutput object returned by * this method is undefined. * - * @since WD.1 + * @since 1.21 * * @return ParserOutput */ @@ -271,7 +271,7 @@ interface Content { * @return Array. A list of DataUpdate objects for putting information * about this content object somewhere. * - * @since WD.1 + * @since 1.21 */ public function getSecondaryDataUpdates( Title $title, Content $old = null, @@ -284,7 +284,7 @@ interface Content { * The last element in the array is the final destination after all redirects * have been resolved (up to $wgMaxRedirects times). * - * @since WD.1 + * @since 1.21 * * @return Array of Titles, with the destination last */ @@ -296,7 +296,7 @@ interface Content { * This will only return the immediate redirect target, useful for * the redirect table and other checks that don't need full recursion. * - * @since WD.1 + * @since 1.21 * * @return Title: The corresponding Title */ @@ -313,7 +313,7 @@ interface Content { * There is usually no need to override the default behaviour, subclasses that * want to implement redirects should override getRedirectTarget(). * - * @since WD.1 + * @since 1.21 * * @return Title */ @@ -323,7 +323,7 @@ interface Content { * Returns whether this Content represents a redirect. * Shorthand for getRedirectTarget() !== null. * - * @since WD.1 + * @since 1.21 * * @return bool */ @@ -333,7 +333,7 @@ interface Content { * If this Content object is a redirect, this method updates the redirect target. * Otherwise, it does nothing. * - * @since WD.1 + * @since 1.21 * * @param Title $target the new redirect target * @@ -344,7 +344,7 @@ interface Content { /** * Returns the section with the given ID. * - * @since WD.1 + * @since 1.21 * * @param $sectionId string The section's ID, given as a numeric string. * The ID "0" retrieves the section before the first heading, "1" the @@ -359,7 +359,7 @@ interface Content { * Replaces a section of the content and returns a Content object with the * section replaced. * - * @since WD.1 + * @since 1.21 * * @param $section Empty/null/false or a section number (0, 1, 2, T1, T2...), or "new" * @param $with Content: new content of the section @@ -372,7 +372,7 @@ interface Content { * Returns a Content object with pre-save transformations applied (or this * object if no transformations apply). * - * @since WD.1 + * @since 1.21 * * @param $title Title * @param $user User @@ -386,7 +386,7 @@ interface Content { * prepended, if supported. The default implementation just returns this * Content object unmodified, ignoring the section header. * - * @since WD.1 + * @since 1.21 * * @param $header string * @return Content @@ -397,7 +397,7 @@ interface Content { * Returns a Content object with preload transformations applied (or this * object if no transformations apply). * - * @since WD.1 + * @since 1.21 * * @param $title Title * @param $popts null|ParserOptions @@ -436,7 +436,7 @@ interface Content { * The necessary updates may be taken from the Content object, or depend on * the current state of the database. * - * @since WD.1 + * @since 1.21 * * @param $page \WikiPage the deleted page * @param $parserOutput null|\ParserOutput optional parser output object diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php index 294dafd09b..21ac488efa 100644 --- a/includes/content/ContentHandler.php +++ b/includes/content/ContentHandler.php @@ -24,7 +24,7 @@ class MWContentSerializationException extends MWException { * type), but wikitext content may be represented by a DOM or AST structure in * the future. * - * @since 1.WD + * @since 1.21 */ abstract class ContentHandler { @@ -49,8 +49,8 @@ abstract class ContentHandler { * TextContent object, this method returns null. * - otherwise, the behaviour is undefined. * - * @since WD.1 - * @deprecated since WD.1. Always try to use the content object. + * @since 1.21 + * @deprecated since 1.21. Always try to use the content object. * * @static * @param $content Content|null @@ -91,7 +91,7 @@ abstract class ContentHandler { * by $modelId (or, if that is not given, $title->getContentModel()) using * the given format. * - * @since WD.1 + * @since 1.21 * * @static * @@ -152,7 +152,7 @@ abstract class ContentHandler { * * Note: this is used by, and may thus not use, Title::getContentModel() * - * @since WD.1 + * @since 1.21 * * @static * @param $title Title @@ -224,7 +224,7 @@ abstract class ContentHandler { /** * Returns the appropriate ContentHandler singleton for the given title. * - * @since WD.1 + * @since 1.21 * * @static * @param $title Title @@ -239,7 +239,7 @@ abstract class ContentHandler { * Returns the appropriate ContentHandler singleton for the given Content * object. * - * @since WD.1 + * @since 1.21 * * @static * @param $content Content @@ -272,7 +272,7 @@ abstract class ContentHandler { * ContentHandler may be provided by the ContentHandlerForModelID hook. * If no ContentHandler can be determined, an MWException is raised. * - * @since WD.1 + * @since 1.21 * * @static * @param $modelId String The ID of the content model for which to get a @@ -379,7 +379,7 @@ abstract class ContentHandler { /** * Serializes a Content object of the type supported by this ContentHandler. * - * @since WD.1 + * @since 1.21 * * @abstract * @param $content Content The Content object to serialize @@ -391,7 +391,7 @@ abstract class ContentHandler { /** * Unserializes a Content object of the type supported by this ContentHandler. * - * @since WD.1 + * @since 1.21 * * @abstract * @param $blob string serialized form of the content @@ -404,7 +404,7 @@ abstract class ContentHandler { * Creates an empty Content object of the type supported by this * ContentHandler. * - * @since WD.1 + * @since 1.21 * * @return Content */ @@ -414,7 +414,7 @@ abstract class ContentHandler { * Returns the model id that identifies the content model this * ContentHandler can handle. Use with the CONTENT_MODEL_XXX constants. * - * @since WD.1 + * @since 1.21 * * @return String The model ID */ @@ -426,7 +426,7 @@ abstract class ContentHandler { * Throws an MWException if $model_id is not the ID of the content model * supported by this ContentHandler. * - * @since WD.1 + * @since 1.21 * * @param String $model_id The model to check * @@ -445,7 +445,7 @@ abstract class ContentHandler { * serializeContent() and unserializeContent() methods of this * ContentHandler. * - * @since WD.1 + * @since 1.21 * * @return array of serialization formats as MIME type like strings */ @@ -460,7 +460,7 @@ abstract class ContentHandler { * This default implementation will return the first element of the array * of formats that was passed to the constructor. * - * @since WD.1 + * @since 1.21 * * @return string the name of the default serialization format as a MIME type */ @@ -475,7 +475,7 @@ abstract class ContentHandler { * Note that if $format is null, this method always returns true, because * null means "use the default format". * - * @since WD.1 + * @since 1.21 * * @param $format string the serialization format to check * @return bool @@ -513,7 +513,7 @@ abstract class ContentHandler { * (and only when) $wgActions[$action] === true. This allows subclasses * to override the default action handlers. * - * @since WD.1 + * @since 1.21 * * @return Array */ @@ -524,7 +524,7 @@ abstract class ContentHandler { /** * Factory for creating an appropriate DifferenceEngine for this content model. * - * @since WD.1 + * @since 1.21 * * @param $context IContextSource context to use, anything else will be * ignored @@ -558,7 +558,7 @@ abstract class ContentHandler { * Also note that the page language may or may not depend on the actual content of the page, * that is, this method may load the content in order to determine the language. * - * @since 1.WD + * @since 1.21 * * @param Title $title the page to determine the language for. * @param Content|null $content the page's content, if you have it handy, to avoid reloading it. @@ -590,7 +590,7 @@ abstract class ContentHandler { * Also note that the page language may or may not depend on the actual content of the page, * that is, this method may load the content in order to determine the language. * - * @since 1.WD + * @since 1.21 * * @param Title $title the page to determine the language for. * @param Content|null $content the page's content, if you have it handy, to avoid reloading it. @@ -632,7 +632,7 @@ abstract class ContentHandler { /** * Returns the name of the diff engine to use. * - * @since WD.1 + * @since 1.21 * * @return string */ @@ -647,7 +647,7 @@ abstract class ContentHandler { * * This default implementation always returns false. * - * @since WD.1 + * @since 1.21 * * @param $oldContent Content|string String * @param $myContent Content|string String @@ -662,7 +662,7 @@ abstract class ContentHandler { /** * Return an applicable auto-summary if one exists for the given edit. * - * @since WD.1 + * @since 1.21 * * @param $oldContent Content|null: the previous text of the page. * @param $newContent Content|null: The submitted text of the page. @@ -736,7 +736,7 @@ abstract class ContentHandler { /** * Auto-generates a deletion reason * - * @since WD.1 + * @since 1.21 * * @param $title Title: the page's title * @param &$hasHistory Boolean: whether the page has a history @@ -843,7 +843,7 @@ abstract class ContentHandler { * between $undo and $undoafter. Revisions must belong to the same page, * must exist and must not be deleted. * - * @since WD.1 + * @since 1.21 * * @param $current Revision The current text * @param $undo Revision The revision to undo @@ -914,7 +914,7 @@ abstract class ContentHandler { * Returns true for content models that support caching using the * ParserCache mechanism. See WikiPage::isParserCacheUser(). * - * @since WD.1 + * @since 1.21 * * @return bool */ @@ -995,7 +995,7 @@ abstract class ContentHandler { } /** - * @since WD.1 + * @since 1.21 */ abstract class TextContentHandler extends ContentHandler { @@ -1058,7 +1058,7 @@ abstract class TextContentHandler extends ContentHandler { } /** - * @since WD.1 + * @since 1.21 */ class WikitextContentHandler extends TextContentHandler { @@ -1089,7 +1089,7 @@ class WikitextContentHandler extends TextContentHandler { # XXX: make ScriptContentHandler base class, do highlighting stuff there? /** - * @since WD.1 + * @since 1.21 */ class JavaScriptContentHandler extends TextContentHandler { @@ -1131,7 +1131,7 @@ class JavaScriptContentHandler extends TextContentHandler { } /** - * @since WD.1 + * @since 1.21 */ class CssContentHandler extends TextContentHandler { diff --git a/includes/content/CssContent.php b/includes/content/CssContent.php index 799600271f..c881380e88 100644 --- a/includes/content/CssContent.php +++ b/includes/content/CssContent.php @@ -1,6 +1,6 @@ generateTextDiffBody( $otext, $ntext ); } @@ -1004,10 +1004,10 @@ class DifferenceEngine extends ContextSource { /** * Use specified text instead of loading from the database - * @deprecated since 1.WD, use setContent() instead. + * @deprecated since 1.21, use setContent() instead. */ function setText( $oldText, $newText ) { - wfDeprecated( __METHOD__, "1.WD" ); + wfDeprecated( __METHOD__, "1.21" ); $oldContent = ContentHandler::makeContent( $oldText, $this->getTitle() ); $newContent = ContentHandler::makeContent( $newText, $this->getTitle() ); @@ -1017,7 +1017,7 @@ class DifferenceEngine extends ContextSource { /** * Use specified text instead of loading from the database - * @since 1.WD + * @since 1.21 */ function setContent( Content $oldContent, Content $newContent ) { $this->mOldContent = $oldContent; diff --git a/includes/installer/Ibm_db2Updater.php b/includes/installer/Ibm_db2Updater.php index 6b7e88de2c..3a42953544 100644 --- a/includes/installer/Ibm_db2Updater.php +++ b/includes/installer/Ibm_db2Updater.php @@ -88,7 +88,7 @@ class Ibm_db2Updater extends DatabaseUpdater { // 1.20 array( 'addTable', 'config', 'patch-config.sql' ), - // 1.WD + // 1.21 array( 'addField', 'revision', 'rev_content_format', 'patch-revision-rev_content_format.sql' ), array( 'addField', 'revision', 'rev_content_model', 'patch-revision-rev_content_model.sql' ), array( 'addField', 'archive', 'ar_content_format', 'patch-archive-ar_content_format.sql' ), diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php index d92ab4a06c..a52c3a778c 100644 --- a/includes/installer/MysqlUpdater.php +++ b/includes/installer/MysqlUpdater.php @@ -216,7 +216,7 @@ class MysqlUpdater extends DatabaseUpdater { array( 'addIndex', 'ipblocks', 'ipb_parent_block_id', 'patch-ipb-parent-block-id-index.sql' ), array( 'dropField', 'category', 'cat_hidden', 'patch-cat_hidden.sql' ), - // 1.WD + // 1.21 array( 'addField', 'revision', 'rev_content_format', 'patch-revision-rev_content_format.sql' ), array( 'addField', 'revision', 'rev_content_model', 'patch-revision-rev_content_model.sql' ), array( 'addField', 'archive', 'ar_content_format', 'patch-archive-ar_content_format.sql' ), diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php index d16de061a1..2f2013571a 100644 --- a/includes/installer/OracleUpdater.php +++ b/includes/installer/OracleUpdater.php @@ -71,7 +71,7 @@ class OracleUpdater extends DatabaseUpdater { array( 'addIndex', 'ipblocks', 'i05', 'patch-ipblocks_i05_index.sql' ), array( 'addIndex', 'revision', 'i05', 'patch-revision_i05_index.sql' ), - //1.WD + //1.21 array( 'addField', 'revision', 'rev_content_format', 'patch-revision-rev_content_format.sql' ), array( 'addField', 'revision', 'rev_content_model', 'patch-revision-rev_content_model.sql' ), array( 'addField', 'archive', 'ar_content_format', 'patch-archive-ar_content_format.sql' ), diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php index 1486683730..b764335501 100644 --- a/includes/installer/SqliteUpdater.php +++ b/includes/installer/SqliteUpdater.php @@ -95,7 +95,7 @@ class SqliteUpdater extends DatabaseUpdater { array( 'addIndex', 'ipblocks', 'ipb_parent_block_id', 'patch-ipb-parent-block-id-index.sql' ), array( 'dropField', 'category', 'cat_hidden', 'patch-cat_hidden.sql' ), - // 1.WD + // 1.21 array( 'addField', 'revision', 'rev_content_format', 'patch-revision-rev_content_format.sql' ), array( 'addField', 'revision', 'rev_content_model', 'patch-revision-rev_content_model.sql' ), array( 'addField', 'archive', 'ar_content_format', 'patch-archive-ar_content_format.sql' ), -- 2.20.1