From: Kunal Mehta <legoktm@gmail.com>
Date: Fri, 20 Nov 2015 22:43:01 +0000 (-0800)
Subject: Move 90e1b22166b0 release notes to 1.27 file, and fix @since tag
X-Git-Tag: 1.31.0-rc.0~8921
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=f5bbdeccb967f299a62821847f7b5e31ab106091;p=lhc%2Fweb%2Fwiklou.git

Move 90e1b22166b0 release notes to 1.27 file, and fix @since tag

Change-Id: Ie40280f3bd0fb6b6fb817e1af1bca8c1901a6891
---

diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index 60e5ac4b3d..1c5984d2c2 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -73,9 +73,6 @@ production.
 * Caches that need purging ability now use the WANObjectCache interface.
   This corresponds to a new $wgMainWANCache setting, which defaults to using
   the $wgMainCacheType settings.
-* Added MWTimestamp::getTimezoneString() which returns the localized timezone
-  string, if available. To localize this string, see the comments of
-  $wgLocaltimezone in includes/DefaultSettings.php.
 * Callers needing fast light-weight data stores use $wgMainStash to select
   the store type from $wgObjectCaches. The default is the local database.
 * Interface message overrides in the MediaWiki namespace will now be cached in
@@ -249,8 +246,6 @@ changes to languages because of Phabricator reports.
 * Watchlist tokens, SpecialResetTokens, and User::getTokenFromOption()
   are deprecated. Applications using those can work via the OAuth
   extension instead. New tokens types should not be added.
-* (T36948) The default file revert message's timestamp is now in $wgLocaltimezone,
-  instead of UTC.
 * DatabaseBase::errorCount() was removed (unused).
 * $wgDeferredUpdateList was removed.
 * DeferredUpdates::addHTMLCacheUpdate() was removed.
diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 3cbeccb067..39b3891a26 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -81,6 +81,9 @@ production.
   and .flex(@grow: 1, @shrink: 1, @width: auto, @order: 1)) in Less to create
   cross-browser-compatible FlexBox rules. Users will still need to add fallback
   float rules or the like for compatibility with IE9- separately.
+* Added MWTimestamp::getTimezoneString() which returns the localized timezone
+  string, if available. To localize this string, see the comments of
+  $wgLocaltimezone in includes/DefaultSettings.php.
 
 == External libraries ==
 === Upgraded external libraries ===
@@ -131,6 +134,8 @@ changes to languages because of Bugzilla reports.
 * MessageBlobStore::getInstance() was removed (deprecated since 1.25).
 * (T84937) Free external links ("autolinked" urls) will now be terminated
   by &nbsp; and HTML entity encodings of &nbsp, <, and >.
+* (T36948) The default file revert message's timestamp is now in $wgLocaltimezone,
+  instead of UTC.
 
 == Compatibility ==
 
diff --git a/includes/MWTimestamp.php b/includes/MWTimestamp.php
index 639403d208..937aedbddc 100644
--- a/includes/MWTimestamp.php
+++ b/includes/MWTimestamp.php
@@ -377,7 +377,7 @@ class MWTimestamp {
 	 * Premade translations are not shipped as format() may return whatever the
 	 * system uses, localized or not, so translation must be done through wiki.
 	 *
-	 * @since 1.25
+	 * @since 1.27
 	 * @return Message The localized timezone message
 	 */
 	public function getTimezoneMessage() {