(bug 17093) Separate date and time in Special:BlockList

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5d73bd5..d6aabab 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -62,7 +62,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 18466) Add note or warning when overruling a move (semi-)protection
 * (bug 18342) insertTags works in edit summary box
 * (bug 18411) The upload form also checks post_max_size
-* Watchlist now has a specialized <div> tag that contains a unique class for each page
+* Watchlist now has a specialized <div> tag that contains a unique class for
+  each page
 * Added Minguo calendar support for the Taiwan Chinese language
 * Database: unionQueries function to be used for UNION sql construction, so
   it can be overloaded on DB abstraction level for DB specific functionality
@@ -71,6 +72,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   month number without the leading zero
 * (bug 13456) categoriespagetext supports PLURAL
 * (bug 18860) Blocks of IPs affecting registered users can now block email
+* (bug 17093) Date and time are separate parameters in Special:BlockList
 
 === Bug fixes in 1.16 ===
 

diff --git a/includes/Block.php b/includes/Block.php
index 767e056..5c2b52f 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -844,8 +844,9 @@ class Block {
                        $expirystr = $msg['infiniteblock'];
                } else {
                        global $wgLang;
-                       $expiretimestr = htmlspecialchars($wgLang->timeanddate( $expiry, true ));
-                       $expirystr = wfMsgReplaceArgs( $msg['expiringblock'], array($expiretimestr) );
+                       $expiredatestr = htmlspecialchars($wgLang->date( $expiry, true ));
+                       $expiretimestr = htmlspecialchars($wgLang->time( $expiry, true ));
+                       $expirystr = wfMsgReplaceArgs( $msg['expiringblock'], array( $expiredatestr, $expiretimestr ) );
                }
                return $expirystr;
        }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index cf9c889..65ac016 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2677,7 +2677,7 @@ See [[Special:IPBlockList|IP block list]] to review blocks.',
 'ipblocklist-submit'              => 'Search',
 'blocklistline'                   => '$1, $2 blocked $3 ($4)',
 'infiniteblock'                   => 'infinite',
-'expiringblock'                   => 'expires $1',
+'expiringblock'                   => 'expires on $1 at $2',
 'anononlyblock'                   => 'anon. only',
 'noautoblockblock'                => 'autoblock disabled',
 'createaccountblock'              => 'account creation blocked',