r49068 probably needs backporting, and it needs to be verified that there are no filesorts remaining from this feature.

herd wrote:

More backport candidates:
r49775 "Fix XSS."
r48993 "Fix regression whereby you were shown an error message after submitting GlobalGroupMembership form"
r48909 and r48910 "Revert r48746 (API userrights). Breaks Special:GlobalGroupMembership by changing overridden methods to static methods, which cannot be overridden. Also reverts r48747, r48814, r48778, r48775" <- possibly Wikimedia-Centric?
r48836 "Follow up on r48015, fix a bug which caused 'A' and 'D' won't work."

Ask Aaron (possibly mostly useful for Wikimedia?) if these should be backported:
r49730 "fix silly typo"
r49685 "* Fixed unblocking of hidden names (bug 18543) * Added permission check"
r49222 "Automatically hide RC log items on block too"
r49191 "setUsernameBitfields() should skip suppress log items"r48993 "Fix regression whereby you were shown an error message after submitting GlobalGroupMembership form"
r48899 "updated static $this to self:: reference in static fetchURL function "
Note also: r48827 r48828 r48886 r49192 r49210 and other changes to these files between 1.15 branch (48811) and 49775 (which was the latest live merge for this issue...? ug, messy)

Also, immediately after the last scap to 48811, brion had to sync /extensions/Collection/ /extensions/ProofreadPage/ /includes/api/ApiQueryImageInfo.php /includes/specials/SpecialUserrights.php /extensions/FlaggedRevs/FlaggedRevs.hooks.php and several other things (to around r48831 or so) to fix immediate fatal errors. See http://wikitech.wikimedia.org/index.php?oldid=19935#March_25

I think the revision I found is most consistent with Wikimedia's current state is about r48825.

The following core files have been updated on Wikimedia, based on svn status -v:

r48813 includes/api/ApiQueryCategories.php
r48819 includes/api/ApiQueryImageInfo.php
r48989 includes/ChangesList.php
r48814 includes/specials/SpecialUserrights.php
r48992 includes/specials/SpecialRecentchanges.php
r48892 includes/specials/SpecialBlockip.php
r49002 includes/specials/SpecialWatchlist.php
r49789 maintenance/storage/trackBlobs.php

Another 32 files have live patches, some of them merges.

Analysis of the live diff suggests the following merges:

• r48909
• r49212
• r48983
• r48923
• r48993
• r49685
• r50054
• Various patches on top of each other in SpecialBlockip.php
• r49775
• r49051
• r49117
• r48836

Also:

• r48735 reversed, logged by Domas as a live patch, March 29.
• Various uncommitted patches to remove change tagging

(In reply to comment #2)

More backport candidates:
r48909 and r48910 "Revert r48746 (API userrights). Breaks
Special:GlobalGroupMembership by changing overridden methods to static methods,
which cannot be overridden. Also reverts r48747, r48814, r48778, r48775" <-
possibly Wikimedia-Centric?

This was redone properly in r48970, r48971, r49013, r49014 and r49015

r49682 still isn't live on Wikimedia sites, but should probably be included just because the bug it fixes (from r47927) is kind of embarrassing.

Backport candidates for the API:
r50041 "Add xml:space=preserve to XML output to prevent XML parsers from
folding whitespace"
r49999 "Fix list=deletedrevs paging bug"
r49956 "Fix internal error when a non-multivalue array-type parameter is set to
the empty string"
r49954 "generator=backlinks returns invalid continue parameter"
r49151 "Purging images through the API now works"
r48813 "Check for title validity in ApiQueryCategories" (fixes fatal)

Backport candicate for the extensions:
r50073 & r50075 "Fix the encoding error for the DPL extension and update the codebase to 1.7.6"

(In reply to comment #9)

Backport candicate for the extensions:
r50073 & r50075 "Fix the encoding error for the DPL extension and update the
codebase to 1.7.6"

That should be r50074 instead of r50073. :)

So r50074 & r50075 to be wish to be backported because of the encoding error.

I've gone ahead and tagged all backported revisions with the '1.15' tag and all revisions mentioned on this bug with the 'backportme' tag on CodeReview:

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/tag/1.15
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/tag/backportme

r50132, r50133 and r50134 should fix a bunch of internal API errors related to $wgTitle being null.

I think the extension backports (r48899, r50074, r50075, r50133) can be done by the extension maintainers. There's no need for me to review them since they won't be in the release tarball.

karun.84 wrote:

I am not sure the bug 16937 that this bug depends on, is actually a MediaWiki bug. It appears to be more of a bug with PHP on Windows. I have provided more information in that bug.

(In reply to comment #14)

I am not sure the bug 16937 that this bug depends on, is actually a MediaWiki
bug. It appears to be more of a bug with PHP on Windows. I have provided more
information in that bug.

It's a MediaWiki issue, we need to fix the error message in MediaWiki to explain what the problem is and how to work around it. It might even be possible to make MediaWiki work correctly with the older protocol version.

Splarka told me to mention bug 18726 here as a possible back port candidate.

Backport candidate from the language files:
r50514: Adds Estonian letters to the linktrail.