r111186 MediaWiki - Code Review archive

In retrospect, I've made a simple mistake here (forgot to remove the old "$html = " line when adding the new one), perhaps someone could followup on that?

Bleh, sorry, that was me editing from my brother's (Grandiose's) computer but forgetting to log him out first :(

Thanks for pointing that out. I missed it when testing this.

Notice: Undefined offset: 1 in /var/www/w/phase3/includes/specials/SpecialRecentchanges.php on line 579

Also, after this revision, the tag filter <input> box has dissapeared...

What extensions are you running? I can't recreate this myself.

A whole bunch - http://pastebin.com/6s217ZPC . None of them should affect RC as far as i can tell. (Sorry, that's probably not very useful for debugging).

var_dumping $extraOpts right before the foreach on SpecialRecentChanges.php

array(2) {
  ["namespace"]=>
  array(2) {
    [0]=>
    string(41) "<label for="namespace">Namespace:</label>"
    [1]=>
    string(1685) "<select id="namespace" name="namespace">
<option value="" selected="">all</option>
<option value="0">(Main)</option>
<option value="1">Talk</option>
<option value="2">User</option>
<option value="3">User talk</option>
<option value="4">Test</option>
<option value="5">Test talk</option>

<option value="6">File</option>
<option value="7">File talk</option>
<option value="8">MediaWiki</option>
<option value="9">MediaWiki talk</option>
<option value="10">Template</option>
<option value="11">Template talk</option>
<option value="12">Help</option>
<option value="13">Help talk</option>
<option value="14">Category</option>

<option value="15">Category talk</option>
<option value="20">Module</option>
<option value="21">Module talk</option>
<option value="90">Thread</option>
<option value="91">Thread talk</option>
<option value="92">Summary</option>
<option value="93">Summary talk</option>
<option value="100">Comments</option>
<option value="101">Comments talk</option>

</select> <input name="invert" type="checkbox" value="1" id="nsinvert" title="Check this box to hide changes to pages within the selected namespace (and the associated namespace if checked)" /> <label for="nsinvert" title="Check this box to hide changes to pages within the selected namespace (and the associated namespace if checked)">Invert selection</label> <input name="associated" type="checkbox" value="1" id="nsassociated" title="Check this box to also include the talk or subject namespace associated with the selected namespace" /> <label for="nsassociated" title="Check this box to also include the talk or subject namespace associated with the selected namespace">Associated namespace</label>"
  }
  ["tagfilter"]=>
  array(1) {
    [0]=>
    string(110) "<label for="tagfilter"><a href="https://www.mediawiki.org/w/phase3/index.php/Special:Tags" title="Special:Tags">Tag</a> filter:</label>"
  }
}

(which is more than a little odd. I'm not sure why that's happening).

Okay, got the problem. My patch had the line:

+		$data = array( Html::rawElement( 'label', array( 'for' => 'tagfilter' ), wfMsgExt( 'tag-filter', 'parseinline' ), ),
+			Xml::input( 'tagfilter', 20, $selected, array( 'class' => 'tagfilter-input' ) ) );

Which has a stray comma (no idea how it got there). Thankfully Mark noticed this and removed it; however, in doing so, he has managed to shift one of the brackets from the first line to the second.

The correct lines should be:

+		$data = array( Html::rawElement( 'label', array( 'for' => 'tagfilter' ), wfMsgExt( 'tag-filter', 'parseinline' ) ),
+			Xml::input( 'tagfilter', 20, $selected, array( 'class' => 'tagfilter-input' ) ) );

That is to say, the top line shouldn't have changed at all, only the second line.

Thanks!

(Incidentally, if someone does feel like re-committing this on my behalf, note that I'm already listed under authors under my real name.)