ChangeTags was backported to 1.25

So change the relevant references to 1.26.

Change-Id: I351de6a77747e3152052a448b8b6d2f25699e1d0

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 8a589f6..2d149b9 100644 (file)
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -94,8 +94,7 @@ production.
 * Update QUnit from v1.14.0 to v1.16.0.
 * Update Moment.js from v2.8.3 to v2.8.4.
 * Special:Tags now allows for manipulating the list of user-modifiable change
-  tags. Actually modifying the tagging of a revision or log entry is not
-  implemented yet.
+  tags.
 * Added 'managetags' user right and 'ChangeTagCanCreate', 'ChangeTagCanDelete',
   and 'ChangeTagCanCreate' hooks to allow for managing user-modifiable change
   tags.
@@ -122,6 +121,10 @@ production.
 * (T94536) You can now make the sitenotice appear to logged-in users only by
   editing MediaWiki:Anonnotice and replacing its content with "". Setting it to
   "-" (default) will continue disable it and fallback to MediaWiki:Sitenotice.
+* Modifying the tagging of a revision or log entry is now available via
+  Special:EditTags, generally accessed via the revision-deletion-like interface
+  on history pages and Special:Log is likely to be more useful.
+* Added 'applychangetags' and 'changetags' user rights.
 
 ==== External libraries ====
 * MediaWiki now requires certain external libraries to be installed. In the past

diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index 3a84d59..46509be 100644 (file)
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -11,10 +11,6 @@ production.
 === Configuration changes in 1.26 ===
 
 === New features in 1.26 ===
-* Modifying the tagging of a revision or log entry is now available via
-  Special:EditTags, generally accessed via the revision-deletion-like interface
-  on history pages and Special:Log is likely to be more useful.
-* Added 'applychangetags' and 'changetags' user rights.
 
 ==== External libraries ====
 

diff --git a/includes/actions/RevisiondeleteAction.php b/includes/actions/RevisiondeleteAction.php
index 6c84bbd..dbcb848 100644 (file)
--- a/includes/actions/RevisiondeleteAction.php
+++ b/includes/actions/RevisiondeleteAction.php
@@ -27,12 +27,12 @@
  * An action that just pass the request to Special:RevisionDelete
  *
  * @ingroup Actions
- * @deprecated since 1.26 This class has been replaced by SpecialPageAction, but
+ * @deprecated since 1.25 This class has been replaced by SpecialPageAction, but
  * you really shouldn't have been using it outside core in the first place
  */
 class RevisiondeleteAction extends FormlessAction {
        public function __construct( Page $page, IContextSource $context = null ) {
-               wfDeprecated( 'RevisiondeleteAction class', '1.26' );
+               wfDeprecated( 'RevisiondeleteAction class', '1.25' );
                parent::__construct( $page, $context );
        }
 

diff --git a/includes/actions/SpecialPageAction.php b/includes/actions/SpecialPageAction.php
index 3c8a21e..9b72163 100644 (file)
--- a/includes/actions/SpecialPageAction.php
+++ b/includes/actions/SpecialPageAction.php
@@ -22,7 +22,7 @@
  * An action that just passes the request to the relevant special page
  *
  * @ingroup Actions
- * @since 1.26
+ * @since 1.25
  */
 class SpecialPageAction extends FormlessAction {
 

diff --git a/includes/changetags/ChangeTagsLogItem.php b/includes/changetags/ChangeTagsLogItem.php
index b648ce0..565d159 100644 (file)
--- a/includes/changetags/ChangeTagsLogItem.php
+++ b/includes/changetags/ChangeTagsLogItem.php
@@ -23,7 +23,7 @@
  * Item class for a logging table row with its associated change tags.
  * @todo Abstract out a base class for this and RevDelLogItem, similar to the
  * RevisionItem class but specifically for log items.
- * @since 1.26
+ * @since 1.25
  */
 class ChangeTagsLogItem extends RevisionItemBase {
        public function getIdField() {

diff --git a/includes/changetags/ChangeTagsLogList.php b/includes/changetags/ChangeTagsLogList.php
index ad274d9..fe80695 100644 (file)
--- a/includes/changetags/ChangeTagsLogList.php
+++ b/includes/changetags/ChangeTagsLogList.php
@@ -21,7 +21,7 @@
 
 /**
  * Stores a list of taggable log entries.
- * @since 1.26
+ * @since 1.25
  */
 class ChangeTagsLogList extends ChangeTagsList {
        public function getType() {

diff --git a/includes/changetags/ChangeTagsRevisionItem.php b/includes/changetags/ChangeTagsRevisionItem.php
index 8225be4..e90a1b4 100644 (file)
--- a/includes/changetags/ChangeTagsRevisionItem.php
+++ b/includes/changetags/ChangeTagsRevisionItem.php
@@ -21,7 +21,7 @@
 
 /**
  * Item class for a live revision table row with its associated change tags.
- * @since 1.26
+ * @since 1.25
  */
 class ChangeTagsRevisionItem extends RevisionItem {
        /**

diff --git a/includes/changetags/ChangeTagsRevisionList.php b/includes/changetags/ChangeTagsRevisionList.php
index c51d605..842d327 100644 (file)
--- a/includes/changetags/ChangeTagsRevisionList.php
+++ b/includes/changetags/ChangeTagsRevisionList.php
@@ -21,7 +21,7 @@
 
 /**
  * Stores a list of taggable revisions.
- * @since 1.26
+ * @since 1.25
  */
 class ChangeTagsRevisionList extends ChangeTagsList {
        public function getType() {

diff --git a/includes/specials/SpecialEditTags.php b/includes/specials/SpecialEditTags.php
index 4b1fcae..14850ff 100644 (file)
--- a/includes/specials/SpecialEditTags.php
+++ b/includes/specials/SpecialEditTags.php
@@ -24,7 +24,7 @@
  * A lot of this is copied out of SpecialRevisiondelete.
  *
  * @ingroup SpecialPage
- * @since 1.26
+ * @since 1.25
  */
 class SpecialEditTags extends UnlistedSpecialPage {
        /** @var bool Was the DB modified in this request */