Move "SpecialSearchResultsPrepend" note back to 1.21

Partial revert of I6a51e3ee: the hooks were actually added
before the branch point (in Ib3843314), not in I226349aa, which
merely added the release note.

The author of I226349aa has already backported the change.

Change-Id: Ifc2728133c6ca52ef866ce963c28bd3d06eab05a

diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 6c68d82..1930636 100644 (file)
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -115,6 +115,7 @@ production.
   uz, vi.
 * Added 'CategoryAfterPageAdded' and 'CategoryAfterPageRemoved' hooks.
 * Added 'HistoryRevisionTools' and 'DiffRevisionTools' hooks.
+* Added 'SpecialSearchResultsPrepend' and 'SpecialSearchResultsAppend' hooks.
 * (bug 33186) Add image rotation api "imagerotate"
 * (bug 34040) Add "User rights management" link on user page toolbox.
 * (bug 45526) Add QUnit assertion helper "QUnit.assert.htmlEqual" for asserting

diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index d3ea77e..bc1d5b7 100644 (file)
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -26,7 +26,6 @@ production.
   version of the Vector extension as this feature may conflict.
 * New version of Special:UserLogin form. It is opt-in for now, controlled by
   the $wgUseVFormUserLogin setting or a 'useNew' URL parameter trigger.
-* Added 'SpecialSearchResultsPrepend' and 'SpecialSearchResultsAppend' hooks.
 * (bug 23343) Implemented ability to apply IP blocks to the contents of X-Forwarded-For headers
   by adding a new configuration variable $wgApplyIpBlocksToXff (disabled by default).
 * The new hook 'APIGetPossibleErrors' to modify the list of possible errors was