This presumably needs to be added to trunk as well?
Adding new 'mergetotrunk' keyword. I imagine we'll have several fixes checked in over the next 24hrs that should make it back up the tree.
That's what "trunk" is for.
I'm not convinced about it being appropiate for trunk, as most sites won't need it, not even wmf in a few days. However, we have no way to know when $wgParserCacheExpireTime after update has elapsed :(
Parser::legacyOptions() returns an array, and getParserOutputKey() expects a string as a second parameter. Domas noticed a lot of keys of the form "enwiki:pcache:idhash:7029871-0!Array" in tcpdump and raised the alarm. I'm just going to revert this for now on the site.
Great way to try improving cache hits without doing anything.
It should have been
$this->getParserOutputKey( $article, $popts->optionsHash( ParserOptions::legacyOptions() ) );
Although all entries this was targetting are probably expired by now.
All those gets would have been misses, so luckily, no real harm was done.