Update code comments that point to 1.18 to point to 1.19

diff --git a/includes/Article.php b/includes/Article.php
index d7c8a54..5c57736 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1128,7 +1128,7 @@ class Article extends Page {
 
        /**
         * Removes trackback record for current article from trackbacks table
-        * @deprecated since 1.19
+        * @deprecated since 1.18
         */
        public function deletetrackback() {
                return Action::factory( 'deletetrackback', $this )->show();
@@ -1154,7 +1154,7 @@ class Article extends Page {
 
        /**
         * Mark this particular edit/page as patrolled
-        * @deprecated since 1.19
+        * @deprecated since 1.18
         */
        public function markpatrolled() {
                Action::factory( 'markpatrolled', $this )->show();
@@ -1162,7 +1162,7 @@ class Article extends Page {
 
        /**
         * User-interface handler for the "watch" action.
-        * Requires Request to pass a token as of 1.19.
+        * Requires Request to pass a token as of 1.18.
         * @deprecated since 1.18
         */
        public function watch() {
@@ -1184,7 +1184,7 @@ class Article extends Page {
 
        /**
         * User interface handler for the "unwatch" action.
-        * Requires Request to pass a token as of 1.19.
+        * Requires Request to pass a token as of 1.18.
         * @deprecated since 1.18
         */
        public function unwatch() {
@@ -1243,7 +1243,7 @@ class Article extends Page {
         * Output a redirect back to the article.
         * This is typically used after an edit.
         *
-        * @deprecated in 1.19; call $wgOut->redirect() directly
+        * @deprecated in 1.18; call $wgOut->redirect() directly
         * @param $noRedir Boolean: add redirect=no
         * @param $sectionAnchor String: section to redirect to, including "#"
         * @param $extraQuery String: extra query params

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 87581c1..2d5635c 100644 (file)
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -62,7 +62,7 @@ class ChangesList extends ContextSource {
         * Fetch an appropriate changes list class for the main context
         * This first argument used to be an User object.
         *
-        * @deprecated in 1.19; use newFromContext() instead
+        * @deprecated in 1.18; use newFromContext() instead
         * @param $unused Unused
         * @return ChangesList|EnhancedChangesList|OldChangesList derivative
         */

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e6c4c6f..9e344f0 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -33,7 +33,7 @@ $wgConf = new SiteConfiguration;
 /** @endcond */
 
 /** MediaWiki version number */
-$wgVersion = '1.19alpha';
+$wgVersion = '1.18';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';
@@ -2409,9 +2409,9 @@ $wgEdititis = false;
 
 /**
  * Better directionality support (bug 6100 and related).
- * Removed in 1.19, still kept here for LiquidThreads backwards compatibility.
+ * Removed in 1.18, still kept here for LiquidThreads backwards compatibility.
  *
- * @deprecated since 1.19
+ * @deprecated since 1.18
  */
 $wgBetterDirectionality = true;
 
@@ -2983,7 +2983,7 @@ $wgArticleCountMethod = null;
 
 /**
  * Backward compatibility setting, will set $wgArticleCountMethod if it is null.
- * @deprecated since 1.19; use $wgArticleCountMethod instead
+ * @deprecated since 1.18; use $wgArticleCountMethod instead
  */
 $wgUseCommaCount = false;
 

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 8aa13e7..397c7ef 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -486,7 +486,7 @@ function wfUrlProtocols() {
  */
 function wfParseUrl( $url ) {
        global $wgUrlProtocols; // Allow all protocols defined in DefaultSettings/LocalSettings.php
-       
+
        // Protocol-relative URLs are handled really badly by parse_url(). It's so bad that the easiest
        // way to handle them is to just prepend 'http:' and strip the protocol out later
        $wasRelative = substr( $url, 0, 2 ) == '//';
@@ -524,7 +524,7 @@ function wfParseUrl( $url ) {
                        $bits['path'] = '/' . $bits['path'];
                }
        }
-       
+
        // If the URL was protocol-relative, fix scheme and delimiter
        if ( $wasRelative ) {
                $bits['scheme'] = '';
@@ -926,7 +926,7 @@ function wfGetLangObj( $langcode = false ) {
  * Old function when $wgBetterDirectionality existed
  * Removed in core, kept in extensions for backwards compat.
  *
- * @deprecated since 1.19
+ * @deprecated since 1.18
  * @return Language
  */
 function wfUILang() {
@@ -2948,7 +2948,7 @@ function wfBaseConvert( $input, $sourceBase, $destBase, $pad = 1, $lowercase = t
  *
  * @param $name String
  * @param $p Array: parameters
- * @deprecated since 1.18, warnings in 1.19, removal in 1.20
+ * @deprecated since 1.18, warnings in 1.18, removal in 1.20
  */
 function wfCreateObject( $name, $p ) {
        wfDeprecated( __FUNCTION__ );
@@ -3331,7 +3331,7 @@ function wfWaitForSlaves( $maxLag = false, $wiki = false ) {
 
 /**
  * Used to be used for outputting text in the installer/updater
- * @deprecated since 1.18, warnings in 1.19, remove in 1.20
+ * @deprecated since 1.18, warnings in 1.18, remove in 1.20
  */
 function wfOut( $s ) {
        wfDeprecated( __METHOD__ );

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 8b589c0..63b8929 100644 (file)
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -115,7 +115,7 @@ class HTMLForm {
        /**
         * Build a new HTMLForm from an array of field attributes
         * @param $descriptor Array of Field constructs, as described above
-        * @param $context RequestContext available since 1.18, will become compulsory in 1.19.
+        * @param $context RequestContext available since 1.18, will become compulsory in 1.18.
         *     Obviates the need to call $form->setTitle()
         * @param $messagePrefix String a prefix to go in front of default messages
         */
@@ -700,7 +700,7 @@ class HTMLForm {
                                        $section .= $this->mSectionFooters[$key];
                                }
                                $attributes = array();
-                               if ( $displayTitle ) { 
+                               if ( $displayTitle ) {
                                        $attributes["id"] = 'prefsection-' . Sanitizer::escapeId( $key, 'noninitial' );
                                }
                                $subsectionHtml .= Xml::fieldset( $legend, $section, $attributes ) . "\n";

diff --git a/includes/Linker.php b/includes/Linker.php
index f9a8cc0..1699db6 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1698,7 +1698,7 @@ class Linker {
                global $wgEnableTooltipsAndAccesskeys;
                if ( !$wgEnableTooltipsAndAccesskeys )
                        return false;
-               
+
                wfProfileIn( __METHOD__ );
 
                $message = wfMessage( "tooltip-$name" );
@@ -1986,7 +1986,7 @@ class Linker {
 }
 
 /**
- * @since 1.19
+ * @since 1.18
  */
 class DummyLinker {
 

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 1aaf8ee..0b4f813 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -469,7 +469,7 @@ class OutputPage {
         *
         * @param $filter
         * @param $position
-        * 
+        *
         * @return Array of module names
         */
        public function getModuleStyles( $filter = false, $position = null ) {
@@ -1832,9 +1832,9 @@ class OutputPage {
         *
         * @param $code Integer: status code
         * @return String or null: message or null if $code is not in the list of
-        *         messages 
+        *         messages
         *
-        * @deprecated since 1.19 Use HttpStatus::getMessage() instead.
+        * @deprecated since 1.18 Use HttpStatus::getMessage() instead.
         */
        public static function getStatusMessage( $code ) {
                wfDeprecated( __METHOD__ );
@@ -2339,7 +2339,7 @@ $templates
         * Add the default ResourceLoader modules to this object
         */
        private function addDefaultModules() {
-               global $wgIncludeLegacyJavaScript, $wgUseAjax, 
+               global $wgIncludeLegacyJavaScript, $wgUseAjax,
                        $wgAjaxWatch, $wgEnableMWSuggest, $wgUseAJAXCategories;
 
                // Add base resources
@@ -2371,7 +2371,7 @@ $templates
                if ( $this->getUser()->getBoolOption( 'editsectiononrightclick' ) ) {
                        $this->addModules( 'mediawiki.action.view.rightClickEdit' );
                }
-               
+
                if ( $wgUseAJAXCategories ) {
                        global $wgAJAXCategoriesNamespaces;
 

diff --git a/includes/PHPVersionError.php b/includes/PHPVersionError.php
index 26823fc..91502a4 100644 (file)
--- a/includes/PHPVersionError.php
+++ b/includes/PHPVersionError.php
@@ -17,7 +17,7 @@
  * version are hardcoded here
  */
 function wfPHPVersionError( $type ){
-       $mwVersion = '1.19';
+       $mwVersion = '1.18';
        $phpVersion = PHP_VERSION;
        $message = "MediaWiki $mwVersion requires at least PHP version 5.2.3, you are using PHP $phpVersion.";
        if( $type == 'index.php' ) {

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index c7c1d5a..ca485c2 100644 (file)
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -42,7 +42,7 @@ function wfGetForwardedFor() {
  * Returns the browser/OS data from the request header
  * Note: headers are spoofable
  *
- * @deprecated in 1.19; use $wgRequest->getHeader( 'User-Agent' ) instead.
+ * @deprecated in 1.18; use $wgRequest->getHeader( 'User-Agent' ) instead.
  * @return string
  */
 function wfGetAgent() {

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 8bca60b..acaf32c 100644 (file)
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -671,7 +671,7 @@ class SpecialPage {
         * Shortcut to get user's language
         *
         * @return Language
-        * @since 1.19
+        * @since 1.18
         */
        public function getLang() {
                return $this->getContext()->getLang();

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 4dbcf15..972de31 100644 (file)
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -228,7 +228,7 @@ class MediaWiki {
                                /**
                                 * $wgArticle is deprecated, do not use it. This will possibly be removed
                                 * entirely in 1.20 or 1.21
-                                * @deprecated since 1.19
+                                * @deprecated since 1.18
                                 */
                                global $wgArticle;
                                $wgArticle = $article;
@@ -253,7 +253,7 @@ class MediaWiki {
        /**
         * Create an Article object of the appropriate class for the given page.
         *
-        * @deprecated in 1.19; use Article::newFromTitle() instead
+        * @deprecated in 1.18; use Article::newFromTitle() instead
         * @param $title Title
         * @param $context RequestContext
         * @return Article object
@@ -289,7 +289,7 @@ class MediaWiki {
                } elseif ( $action == 'editredlink' ) {
                        $action = 'edit';
                }
-               
+
                // Write back the executed action
                $request->setVal( 'action', $action );
                return $action;

diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index 5899fc0..f6551aa 100644 (file)
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -2075,7 +2075,7 @@ class WikiPage extends Page {
         * @todo This is a shitty interface function. Kill it and replace the
         * other shitty functions like doEditUpdates and such so it's not needed
         * anymore.
-        * @deprecated since 1.19, use doEditUpdates()
+        * @deprecated since 1.18, use doEditUpdates()
         */
        public function createUpdates( $rev ) {
                global $wgUser;
@@ -2524,7 +2524,7 @@ class WikiPage extends Page {
        }
 
        /*
-       * @deprecated since 1.19
+       * @deprecated since 1.18
        */
        public function quickEdit( $text, $comment = '', $minor = 0 ) {
                global $wgUser;
@@ -2532,7 +2532,7 @@ class WikiPage extends Page {
        }
 
        /*
-       * @deprecated since 1.19
+       * @deprecated since 1.18
        */
        public function viewUpdates() {
                global $wgUser;
@@ -2540,7 +2540,7 @@ class WikiPage extends Page {
        }
 
        /*
-       * @deprecated since 1.19
+       * @deprecated since 1.18
        */
        public function useParserCache( $oldid ) {
                global $wgUser;

diff --git a/includes/actions/WatchAction.php b/includes/actions/WatchAction.php
index 79c69ed..dc2d5d3 100644 (file)
--- a/includes/actions/WatchAction.php
+++ b/includes/actions/WatchAction.php
@@ -113,7 +113,7 @@ class WatchAction extends FormAction {
         * @param User $title User for whom the action is going to be performed
         * @param string $action Optionally override the action to 'unwatch'
         * @return string Token
-        * @since 1.19
+        * @since 1.18
         */
        public static function getWatchToken( Title $title, User $user, $action = 'watch' ) {
                if ( $action != 'unwatch' ) {
@@ -133,7 +133,7 @@ class WatchAction extends FormAction {
         * @param User $title User for whom the action is going to be performed
         * @param string $action Optionally override the action to 'watch'
         * @return string Token
-        * @since 1.19
+        * @since 1.18
         */
        public static function getUnwatchToken( Title $title, User $user, $action = 'unwatch' ) {
                return self::getWatchToken( $title, $user, $action );

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index 32adcf7..242f6be 100644 (file)
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -181,8 +181,6 @@ class MysqlUpdater extends DatabaseUpdater {
                        array( 'doUserNewTalkTimestampNotNull' ),
                        array( 'addIndex', 'user',          'user_email',       'patch-user_email_index.sql' ),
                        array( 'modifyField', 'user_properties', 'up_property', 'patch-up_property.sql' ),
-
-                       // 1.19
                        array( 'addTable', 'config', 'patch-config.sql' ),
                        array( 'addTable', 'uploadstash', 'patch-uploadstash.sql' ),
                );

diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php
index dd0f1d5..81ad787 100644 (file)
--- a/includes/installer/OracleUpdater.php
+++ b/includes/installer/OracleUpdater.php
@@ -30,18 +30,16 @@ class OracleUpdater extends DatabaseUpdater {
                        array( 'doSchemaUpgrade17' ),
                        array( 'doInsertPage0' ),
                        array( 'doRemoveNotNullEmptyDefaults' ),
-                       
+
                        //1.18
                        array( 'addIndex',      'user',          'i02',       'patch-user_email_index.sql' ),
                        array( 'modifyField', 'user_properties', 'up_property', 'patch-up_property.sql' ),
-
-                       // 1.19
                        array( 'addTable', 'config', 'patch-config.sql' ),
 
 
                        // till 2.0 i guess
                        array( 'doRebuildDuplicateFunction' ),
-                       
+
                );
        }
 

diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index 4031293..daed095 100644 (file)
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -58,8 +58,6 @@ class SqliteUpdater extends DatabaseUpdater {
 
                        // 1.18
                        array( 'addIndex', 'user',          'user_email',       'patch-user_email_index.sql' ),
-
-                       // 1.19
                        array( 'addTable', 'config', 'patch-config.sql' ),
                        array( 'addTable', 'uploadstash', 'patch-uploadstash.sql' ),
                );

diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 1293353..fe37279 100644 (file)
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -64,7 +64,7 @@ class SearchEngine {
 
        /**
         * If this search backend can list/unlist redirects
-        * @deprecated since 1.19 Call supports( 'list-redirects' );
+        * @deprecated since 1.18 Call supports( 'list-redirects' );
         */
        function acceptListRedirects() {
                return $this->supports( 'list-redirects' );

diff --git a/resources/mediawiki/mediawiki.Title.js b/resources/mediawiki/mediawiki.Title.js
index a3459ac..3978d66 100644 (file)
--- a/resources/mediawiki/mediawiki.Title.js
+++ b/resources/mediawiki/mediawiki.Title.js
@@ -3,7 +3,7 @@
  *
  * @author Neil Kandalgaonkar, 2010
  * @author Timo Tijhof, 2011
- * @since 1.19
+ * @since 1.18
  *
  * Relies on: mw.config (wgFormattedNamespaces, wgNamespaceIds, wgCaseSensitiveNamespaces), mw.util.wikiGetlink
  */