Merge "Floor slave lag before display"

diff --combined includes/OutputPage.php
index 77dbde7,74ade3e..1083687
--- 1/includes/OutputPage.php
--- 2/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@@ -2547,6 -2547,7 +2547,7 @@@ class OutputPage extends ContextSource 
        public function showLagWarning( $lag ) {
                $config = $this->getConfig();
                if ( $lag >= $config->get( 'SlaveLagWarning' ) ) {
+                       $lag = floor( $lag ); // floor to avoid nano seconds to display
                        $message = $lag < $config->get( 'SlaveLagCritical' )
                                ? 'lag-warn-normal'
                                : 'lag-warn-high';
@@@ -2688,6 -2689,12 +2689,6 @@@
                                                        // Special case in buildExemptModules()
                                                        return false;
                                                }
 -                                              if ( $name === 'site.styles' ) {
 -                                                      // HACK: Technically, 'site.styles' isn't in a separate request group.
 -                                                      // But, in order to ensure its styles are in the right position,
 -                                                      // pretend it's in a group called 'site'.
 -                                                      $group = 'site';
 -                                              }
                                                if ( isset( $exemptGroups[$group] ) ) {
                                                        $exemptStates[$name] = 'ready';
                                                        if ( !$module->isKnownEmpty( $context ) ) {
@@@ -2846,6 -2853,7 +2847,6 @@@
  
        private function isUserJsPreview() {
                return $this->getConfig()->get( 'AllowUserJs' )
 -                      && $this->getUser()->isLoggedIn()
                        && $this->getTitle()
                        && $this->getTitle()->isJsSubpage()
                        && $this->userCanPreview();
@@@ -2853,6 -2861,7 +2854,6 @@@
  
        private function isUserCssPreview() {
                return $this->getConfig()->get( 'AllowUserCss' )
 -                      && $this->getUser()->isLoggedIn()
                        && $this->getTitle()
                        && $this->getTitle()->isCssSubpage()
                        && $this->userCanPreview();
@@@ -3089,11 -3098,6 +3090,11 @@@
                }
  
                $user = $this->getUser();
 +
 +              if ( !$user->isLoggedIn() ) {
 +                      // Anons have predictable edit tokens
 +                      return false;
 +              }
                if ( !$user->matchEditToken( $request->getVal( 'wpEditToken' ) ) ) {
                        return false;
                }