Merge "Update docs for AllowUserCssPrefs to not mention performance"

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index fa30d68..037a80f 100644 (file)
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -1294,7 +1294,7 @@ class DifferenceEngine extends ContextSource {
 
                if ( !$diff && !$otitle ) {
                        $header .= "
-                       <tr style=\"vertical-align: top;\" lang=\"{$userLang}\">
+                       <tr class=\"diff-title\" lang=\"{$userLang}\">
                        <td class=\"diff-ntitle\">{$ntitle}</td>
                        </tr>";
                        $multiColspan = 1;
@@ -1313,7 +1313,7 @@ class DifferenceEngine extends ContextSource {
                        }
                        if ( $otitle || $ntitle ) {
                                $header .= "
-                               <tr style=\"vertical-align: top;\" lang=\"{$userLang}\">
+                               <tr class=\"diff-title\" lang=\"{$userLang}\">
                                <td colspan=\"$colspan\" class=\"diff-otitle\">{$otitle}</td>
                                <td colspan=\"$colspan\" class=\"diff-ntitle\">{$ntitle}</td>
                                </tr>";
@@ -1321,12 +1321,12 @@ class DifferenceEngine extends ContextSource {
                }
 
                if ( $multi != '' ) {
-                       $header .= "<tr><td colspan=\"{$multiColspan}\" style=\"text-align: center;\" " .
+                       $header .= "<tr><td colspan=\"{$multiColspan}\" " .
                                "class=\"diff-multi\" lang=\"{$userLang}\">{$multi}</td></tr>";
                }
                if ( $notice != '' ) {
-                       $header .= "<tr><td colspan=\"{$multiColspan}\" style=\"text-align: center;\" " .
-                               "lang=\"{$userLang}\">{$notice}</td></tr>";
+                       $header .= "<tr><td colspan=\"{$multiColspan}\" " .
+                               "class=\"diff-notice\" lang=\"{$userLang}\">{$notice}</td></tr>";
                }
 
                return $header . $diff . "</table>";

diff --git a/includes/logging/LogPager.php b/includes/logging/LogPager.php
index dc9af5a..d1acacf 100644 (file)
--- a/includes/logging/LogPager.php
+++ b/includes/logging/LogPager.php
@@ -424,9 +424,9 @@ class LogPager extends ReverseChronologicalPager {
                $this->actionRestrictionsEnforced = true;
                $user = $this->getUser();
                if ( !$user->isAllowed( 'deletedhistory' ) ) {
-                       $this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::DELETED_USER ) . ' = 0';
+                       $this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::DELETED_ACTION ) . ' = 0';
                } elseif ( !$user->isAllowedAny( 'suppressrevision', 'viewsuppressed' ) ) {
-                       $this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::SUPPRESSED_USER ) .
+                       $this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::SUPPRESSED_ACTION ) .
                                ' != ' . LogPage::SUPPRESSED_USER;
                }
        }
@@ -442,9 +442,9 @@ class LogPager extends ReverseChronologicalPager {
                $this->performerRestrictionsEnforced = true;
                $user = $this->getUser();
                if ( !$user->isAllowed( 'deletedhistory' ) ) {
-                       $this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::DELETED_ACTION ) . ' = 0';
+                       $this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::DELETED_USER ) . ' = 0';
                } elseif ( !$user->isAllowedAny( 'suppressrevision', 'viewsuppressed' ) ) {
-                       $this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::SUPPRESSED_ACTION ) .
+                       $this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::SUPPRESSED_USER ) .
                                ' != ' . LogPage::SUPPRESSED_ACTION;
                }
        }

diff --git a/resources/src/mediawiki/mediawiki.diff.styles.css b/resources/src/mediawiki/mediawiki.diff.styles.css
index 7260a0a..c469222 100644 (file)
--- a/resources/src/mediawiki/mediawiki.diff.styles.css
+++ b/resources/src/mediawiki/mediawiki.diff.styles.css
@@ -33,6 +33,12 @@
        word-wrap: break-word;
 }
 
+.diff-title {
+       vertical-align: top;
+}
+
+.diff-notice,
+.diff-multi,
 .diff-otitle,
 .diff-ntitle {
        text-align: center;