(bug 10076) If a user is blocked as the result of a rangeblock, add the effective...

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index c86180a..f7030ee 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -792,7 +792,12 @@ class OutputPage {
                        $msg = 'blockedtext';
                }
 
-               $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry ) );
+               //If it's a range block, get the range in CIDR and hand it back.
+               if ($wgUser->mBlock->mRangeStart != $wgUser->mBlock->mRangeEnd) {
+                       $ipRange = $wgUser->mBlock->mAddress;
+               }
+
+               $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $ipRange ) );
                
                # Don't auto-return to special pages
                if( $return ) {