Merge "Swap exif-pixelydimension and exif-pixelxdimension messages"

[lhc/web/wiklou.git] / includes / specials / pagers / BlockListPager.php

diff --git a/includes/specials/pagers/BlockListPager.php b/includes/specials/pagers/BlockListPager.php
index 8857907..d822976 100644 (file)
--- a/includes/specials/pagers/BlockListPager.php
+++ b/includes/specials/pagers/BlockListPager.php
@@ -140,6 +140,22 @@ class BlockListPager extends TablePager {
                                                                $language->pipeList( $links ) )->escaped()
                                                );
                                }
+                               if ( $value !== 'infinity' ) {
+                                       $timestamp = new MWTimestamp( $value );
+                                       $formatted .= '<br />' . $this->msg(
+                                               'ipb-blocklist-duration-left',
+                                               $language->formatDuration(
+                                                       $timestamp->getTimestamp() - time(),
+                                                       // reasonable output
+                                                       [
+                                                               'minutes',
+                                                               'hours',
+                                                               'days',
+                                                               'years',
+                                                       ]
+                                               )
+                                       )->escaped();
+                               }
                                break;
 
                        case 'ipb_by':
@@ -225,7 +241,7 @@ class BlockListPager extends TablePager {
                return $info;
        }
 
-       public function getTableClass() {
+       protected function getTableClass() {
                return parent::getTableClass() . ' mw-blocklist';
        }