2010/12/31 Roan Kattouw roan.kattouw@gmail.com:
I'll take a look at cleaning this up right now. I'll do this by reverting r79129 and merging the revisions it merged more carefully and in smaller batches.
This is fixed now. I didn't go to such extremes as to completely revert and re-do r79129; instead I did that just for Vector.php . As Daniel correctly pointed out, the breakage was caused by a botched merge (r79129) that accidentally merged half the BaseTemplate changes to 1.17, causing it to break because the other half was missing.
I've seen more things wrong with the r79129 merge (all extensions changes missing, changes to mediawiki.js missing), so I'll audit the entire thing by hand and clean it up where needed.
Roan Kattouw (Catrope)