Rename $wgSlaveLagOhNo (r22310) to $wgSlaveLagCritical.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index a8899d2..72d4f85 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2564,10 +2564,10 @@ $wgDisableOutputCompression = false;
 
 /**
  * If lag is higher than $wgSlaveLagWarning, show a warning in some special 
- * pages (like watchlist).  If the lag is higher than $wgSlaveLagOhNo, show a 
- * more obvious warning.
+ * pages (like watchlist).  If the lag is higher than $wgSlaveLagCritical,
+ * show a more obvious warning.
  */
 $wgSlaveLagWarning = 10;
-$wgSlaveLagOhNo = 30;
+$wgSlaveLagCritical = 30;
 
 ?>

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 384e803..ef1e272 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1246,12 +1246,12 @@ class OutputPage {
         * @param int $lag Slave lag
         */
        public function showLagWarning( $lag ) {
-               global $wgSlaveLagWarning, $wgSlaveLagOhNo;
+               global $wgSlaveLagWarning, $wgSlaveLagCritical;
                
                if ($lag < $wgSlaveLagWarning)
                        return;
 
-               $message = $lag >= $wgSlaveLagOhNo ? 'lag-warn-high' : 'lag-warn-normal';
+               $message = ($lag >= $wgSlaveLagCritical) ? 'lag-warn-high' : 'lag-warn-normal';
                $warning = wfMsgHtml( $message, htmlspecialchars( $lag ) );
                $this->addHtml( "<div class=\"mw-{$message}\">\n{$warning}\n</div>\n" );
        }