Revert "Resolve bug #18704 ("Add an unique CSS class or ID to the tagfilter table...

It was causing: <b>Notice</b>: Array to string conversion in <b>D:\www\DevWiki\core\includes\actions\HistoryAction.php</b> on line <b>164</b><br />

This reverts commit 6cd3995f11c36ab3a58fd7d59f8c0320e15480a3.

Conflicts:

	RELEASE-NOTES-1.20

Change-Id: Iad8dad0bbc07214620af62533df432065e4698c0

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index a0b3d4d..73f48f5 100644 (file)
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -63,7 +63,6 @@ production.
 * (bug 34735) Updated compressOld.php documentation to mention the different
   usages of -s and -n parameters depending on compression type.
 * (bug 13896) Rendering of devanagari numbers in automatic '#' number lists.
-* (bug 18704) Add an unique CSS class or ID to the tagfilter table row at RecentChanges.
 * (bug 33689) Upgrade to 1.19 on Postgres fails due to incomplete query when.
   trying to defer foreign key for externallinks.
 * (bug 32748) Printer friendly version of article decode Unicode chars as a

diff --git a/includes/ChangeTags.php b/includes/ChangeTags.php
index 01b93ad..63d3732 100644 (file)
--- a/includes/ChangeTags.php
+++ b/includes/ChangeTags.php
@@ -210,7 +210,7 @@ class ChangeTags {
                        return $fullForm ? '' : array();
 
                $data = array( Html::rawElement( 'label', array( 'for' => 'tagfilter' ), wfMsgExt( 'tag-filter', 'parseinline' ) ),
-                       Xml::input( 'tagfilter', 20, $selected ), array( 'class' => 'mw-tagfilter-input' ) );
+                       Xml::input( 'tagfilter', 20, $selected ) );
 
                if ( !$fullForm ) {
                        return $data;
@@ -219,7 +219,7 @@ class ChangeTags {
                $html = implode( ' ', $data );
                $html .= "\n" . Xml::element( 'input', array( 'type' => 'submit', 'value' => wfMsg( 'tag-filter-submit' ) ) );
                $html .= "\n" . Html::hidden( 'title', $title->getPrefixedText() );
-               $html = Xml::tags( 'form', array( 'action' => $title->getLocalURL(), 'class' => 'mw-tagfilter-form', 'method' => 'get' ), $html );
+               $html = Xml::tags( 'form', array( 'action' => $title->getLocalURL(), 'method' => 'get' ), $html );
 
                return $html;
        }

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index c05aaad..bfc5248 100644 (file)
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -568,14 +568,14 @@ class SpecialRecentChanges extends IncludableSpecialPage {
                $submit = ' ' . Xml::submitbutton( wfMsg( 'allpagessubmit' ) );
 
                $out = Xml::openElement( 'table', array( 'class' => 'mw-recentchanges-table' ) );
-               foreach( $extraOpts as $name => $optionRow ) {
+               foreach( $extraOpts as $optionRow ) {
                        # Add submit button to the last row only
                        ++$count;
-                       $addSubmit = ( $count === $extraOptsCount ) ? $submit : '';
+                       $addSubmit = $count === $extraOptsCount ? $submit : '';
 
                        $out .= Xml::openElement( 'tr' );
                        if( is_array( $optionRow ) ) {
-                               $out .= Xml::tags( 'td', array( 'class' => 'mw-label mw-' . $name . '-label' ), $optionRow[0] );
+                               $out .= Xml::tags( 'td', array( 'class' => 'mw-label' ), $optionRow[0] );
                                $out .= Xml::tags( 'td', array( 'class' => 'mw-input' ), $optionRow[1] . $addSubmit );
                        } else {
                                $out .= Xml::tags( 'td', array( 'class' => 'mw-input', 'colspan' => 2 ), $optionRow . $addSubmit );