Index: trunk/phase3/includes/OutputPage.php |
— | — | @@ -745,6 +745,7 @@ |
746 | 746 | |
747 | 747 | $id = $wgUser->blockedBy(); |
748 | 748 | $reason = $wgUser->blockedFor(); |
| 749 | + $blockTimestamp = $wgLang->timeanddate( wfTimestamp( TS_MW, $wgUser->mBlock->mTimestamp ), true ); |
749 | 750 | $ip = wfGetIP(); |
750 | 751 | |
751 | 752 | if ( is_numeric( $id ) ) { |
— | — | @@ -784,8 +785,8 @@ |
785 | 786 | * This could be a username, an ip range, or a single ip. */ |
786 | 787 | $intended = $wgUser->mBlock->mAddress; |
787 | 788 | |
788 | | - $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended ) ); |
789 | | - |
| 789 | + $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended, $blockTimestamp ) ); |
| 790 | + |
790 | 791 | # Don't auto-return to special pages |
791 | 792 | if( $return ) { |
792 | 793 | $return = $wgTitle->getNamespace() > -1 ? $wgTitle->getPrefixedText() : NULL; |
Index: trunk/phase3/languages/messages/MessagesEn.php |
— | — | @@ -937,8 +937,9 @@ |
938 | 938 | |
939 | 939 | The block was made by $1. The reason given is ''$2''. |
940 | 940 | |
941 | | -Expiry of block: $6<br /> |
942 | | -Intended blockee: $7 |
| 941 | +* Begin of block: $8 |
| 942 | +* Expiry of block: $6 |
| 943 | +* Intended blockee: $7 |
943 | 944 | |
944 | 945 | You can contact $1 or another [[{{MediaWiki:grouppage-sysop}}|administrator]] to discuss the block. |
945 | 946 | You cannot use the 'email this user' feature unless a valid email address is specified in your |
— | — | @@ -949,7 +950,8 @@ |
950 | 951 | |
951 | 952 | :\'\'$2\'\' |
952 | 953 | |
953 | | -Expiry of block: $6 |
| 954 | +* Begin of block: $8 |
| 955 | +* Expiry of block: $6 |
954 | 956 | |
955 | 957 | You may contact $1 or one of the other |
956 | 958 | [[{{MediaWiki:grouppage-sysop}}|administrators]] to discuss the block. |