Merge "Allow users to tag file uploads"

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 5e2b981..8822e0c 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -3274,6 +3274,8 @@ $user: User whose groups changed
 $added: Groups added
 $removed: Groups removed
 $performer: User who performed the change, false if via autopromotion
+$reason: The reason, if any, given by the user performing the change,
+false if via autopromotion.
 
 'UserIsBlockedFrom': Check if a user is blocked from a specific page (for
 specific block exemptions).

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index 7351c33..205b67e 100644 (file)
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -292,7 +292,7 @@ class UserrightsPage extends SpecialPage {
                $user->invalidateCache();
 
                // update groups in external authentication database
-               Hooks::run( 'UserGroupsChanged', array( $user, $add, $remove, $this->getUser() ) );
+               Hooks::run( 'UserGroupsChanged', array( $user, $add, $remove, $this->getUser(), $reason ) );
                $wgAuth->updateExternalDBGroups( $user, $add, $remove );
 
                wfDebug( 'oldGroups: ' . print_r( $oldGroups, true ) . "\n" );

diff --git a/includes/user/User.php b/includes/user/User.php
index 749ec46..95e5ceb 100644 (file)
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -1387,7 +1387,7 @@ class User implements IDBAccessObject {
                        $this->addGroup( $group );
                }
                // update groups in external authentication database
-               Hooks::run( 'UserGroupsChanged', array( $this, $toPromote, array(), false ) );
+               Hooks::run( 'UserGroupsChanged', array( $this, $toPromote, array(), false, false ) );
                $wgAuth->updateExternalDBGroups( $this, $toPromote );
 
                $newGroups = array_merge( $oldGroups, $toPromote ); // all groups

diff --git a/resources/src/mediawiki.legacy/commonPrint.css b/resources/src/mediawiki.legacy/commonPrint.css
index 4803a0a..77ecfcb 100644 (file)
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -127,11 +127,23 @@ pre, .mw-code {
 }
 
 /* Space between the columns for tocnumber and toctext */
-.tocnumber:after {
-       content: "";
+.tocnumber {
+       padding-left: 0;
        padding-right: 0.5em;
 }
 
+/* @noflip */
+.mw-content-ltr .tocnumber {
+       padding-left: 0;
+       padding-right: 0.5em;
+}
+
+/* @noflip */
+.mw-content-rtl .tocnumber {
+       padding-left: 0.5em;
+       padding-right: 0;
+}
+
 #footer {
        background: white;
        color: black;

diff --git a/resources/src/mediawiki.skinning/content.css b/resources/src/mediawiki.skinning/content.css
index c88d00d..e6f92a5 100644 (file)
--- a/resources/src/mediawiki.skinning/content.css
+++ b/resources/src/mediawiki.skinning/content.css
@@ -96,11 +96,21 @@ table.toc td {
 }
 
 /* Space between the columns for tocnumber and toctext */
-/* Ignored by IE7 and lower */
-.tocnumber:after {
-       content: "";
-       display: inline-block;
-       width: 0.5em;
+.tocnumber {
+       padding-left: 0;
+       padding-right: 0.5em;
+}
+
+/* @noflip */
+.mw-content-ltr .tocnumber {
+       padding-left: 0;
+       padding-right: 0.5em;
+}
+
+/* @noflip */
+.mw-content-rtl .tocnumber {
+       padding-left: 0.5em;
+       padding-right: 0;
 }
 
 /* Warning */