Merge "jquery.tablesorter: Only look at th's for headers"

diff --combined resources/src/jquery/jquery.tablesorter.js
index b46ab37,ae28536..ea2c5f9
--- 1/resources/src/jquery/jquery.tablesorter.js
--- 2/resources/src/jquery/jquery.tablesorter.js
+++ b/resources/src/jquery/jquery.tablesorter.js
@@@ -296,6 -296,8 +296,6 @@@
                        colspan,
                        headerCount,
                        longestTR,
 -                      matrixRowIndex,
 -                      matrixColumnIndex,
                        exploded,
                        $tableHeaders = $( [] ),
                        $tableRows = $( 'thead:eq(0) > tr', table );
@@@ -307,9 -309,6 +307,9 @@@
                        // Loop through all the dom cells of the thead
                        $tableRows.each( function ( rowIndex, row ) {
                                $.each( row.cells, function ( columnIndex, cell ) {
 +                                      var matrixRowIndex,
 +                                              matrixColumnIndex;
 +
                                        rowspan = Number( cell.rowSpan );
                                        colspan = Number( cell.colSpan );
  
@@@ -332,14 -331,14 +332,14 @@@
                        } );
                        // We want to find the row that has the most columns (ignoring colspan)
                        $.each( exploded, function ( index, cellArray ) {
-                               headerCount = $.unique( $( cellArray ) ).length;
+                               headerCount = $( uniqueElements( cellArray ) ).filter( 'th' ).length;
                                if ( headerCount >= maxSeen ) {
                                        maxSeen = headerCount;
                                        longestTR = index;
                                }
                        } );
                        // We cannot use $.unique() here because it sorts into dom order, which is undesirable
-                       $tableHeaders = $( uniqueElements( exploded[longestTR] ) );
+                       $tableHeaders = $( uniqueElements( exploded[longestTR] ) ).filter( 'th' );
                }
  
                // as each header can span over multiple columns (using colspan=N),