Merge "updater: Move rev_sha1 addition before convertUserOptions"

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 86b0849..f8e67f5 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5225,11 +5225,18 @@ $wgUseTagFilter = true;
 $wgUnwatchedPageThreshold = false;
 
 /**
- * Recent changes flag, shown in Recentchanges and watchlist
+ * Flags (letter symbols) shown in recent changes and watchlist to indicate
+ * certain types of edits.
  *
- * Adding a new one:
- *   $wgRecentChangesFlags['flag'] => array( 'letter-msg', 'tooltip-msg' );
- * 'class' allows to set a css class different than the flag name
+ * To register a new one:
+ * @code
+ * $wgRecentChangesFlags['flag'] => array(
+ *   'letter' => 'letter-msg',
+ *   'title' => 'tooltip-msg'
+ * );
+ * @endcode
+ *
+ * Optional 'class' allows to set a css class different than the flag name.
  *
  * @since 1.22
  */

diff --git a/resources/jquery/jquery.tablesorter.js b/resources/jquery/jquery.tablesorter.js
index acf21d6..115a49a 100644 (file)
--- a/resources/jquery/jquery.tablesorter.js
+++ b/resources/jquery/jquery.tablesorter.js
@@ -345,8 +345,11 @@
                        if ( !this.sortDisabled ) {
                                $( this )
                                        .addClass( table.config.cssHeader )
-                                       .attr( 'title', msg[1] )
-                                       .prop( 'tabIndex', 0 ).attr( 'role', 'button' );
+                                       .prop( 'tabIndex', 0 )
+                                       .attr( {
+                                               role: 'button',
+                                               title: msg[1]
+                                       } );
                        }
 
                        // add cell to headerList