Merge "resourceloader: Remove unused static $contexts var in ResourceLoaderImageTest"

[lhc/web/wiklou.git] / includes / block / CompositeBlock.php

diff --git a/includes/block/CompositeBlock.php b/includes/block/CompositeBlock.php
index fda1505..8efd7de 100644 (file)
--- a/includes/block/CompositeBlock.php
+++ b/includes/block/CompositeBlock.php
@@ -106,13 +106,27 @@ class CompositeBlock extends AbstractBlock {
                return $this->originalBlocks;
        }
 
+       /**
+        * @inheritDoc
+        */
+       public function getExpiry() {
+               $maxExpiry = null;
+               foreach ( $this->originalBlocks as $block ) {
+                       $expiry = $block->getExpiry();
+                       if ( $maxExpiry === null || $expiry === '' || $expiry > $maxExpiry ) {
+                               $maxExpiry = $expiry;
+                       }
+               }
+               return $maxExpiry;
+       }
+
        /**
         * @inheritDoc
         */
        public function getPermissionsError( IContextSource $context ) {
                $params = $this->getBlockErrorParams( $context );
 
-               $msg = $this->isSitewide() ? 'blockedtext' : 'blockedtext-partial';
+               $msg = 'blockedtext-composite';
 
                array_unshift( $params, $msg );