Page MenuHomePhabricator
Files F4283

patch2
Public
Actions

Authored By
• bzimport
Nov 21 2014, 9:55 PM
Size
2 KB
Referenced Files
None
Subscribers
None

patch2
View Options

Index: ParserFunctions.php
===================================================================
--- ParserFunctions.php (revision 41831)
+++ ParserFunctions.php (working copy)
@@ -396,22 +396,44 @@
if ( isset( $this->mTimeCache[$format][$date][$local] ) ) {
return $this->mTimeCache[$format][$date][$local];
}
-
- if ( $date !== '' ) {
- $unix = @strtotime( $date );
- } else {
- $unix = time();
- }
-
- if ( $unix == -1 || $unix == false ) {
- wfLoadExtensionMessages( 'ParserFunctions' );
- $result = '<strong class="error">' . wfMsgForContent( 'pfunc_time_error' ) . '</strong>';
- } else {
- $this->mTimeChars += strlen( $format );
- if ( $this->mTimeChars > $this->mMaxTimeChars ) {
- wfLoadExtensionMessages( 'ParserFunctions' );
- return '<strong class="error">' . wfMsgForContent( 'pfunc_time_too_long' ) . '</strong>';
+
+ #compute the timestamp string $ts
+ #PHP >= 5.2 can handle dates before 1970 or after 2038 using the DateTime object
+ #PHP < 5.2 is limited to dates between 1970 and 2038
+
+ $invalidTime = false;
+
+ if ( class_exists( DateTime ) ) { #PHP >= 5.2
+ try { #the DateTime constructor must be used because it throws exceptions when errors occur, whereas date_create appears to just output a warning that can't really be detected from within the code
+ if ( $date !== '' ) {
+ $dateObject = new DateTime( $date );
+ } else {
+ $dateObject = new DateTime(); #use current date and time
+ }
+
+ if ( $local ) {
+ if ( isset( $wgLocaltimezone ) ) { #convert to MediaWiki local timezone if set
+ $dateObject->setTimeZone( new DateTimeZone( $wgLocaltimezone ) );
+ } #otherwise leave in PHP default
+ } else {
+ #if local time was not requested, convert to UTC
+ $dateObject->setTimeZone( new DateTimeZone( 'UTC' ) );
+ }
+
+ $ts = $dateObject->format( 'YmdHis' );
+ } catch (Exception $ex) {
+ $invalidTime = true;
+ }
+ } else { #PHP < 5.2
+ if ( $date !== '' ) {
+ $unix = @strtotime( $date );
} else {
+ $unix = time();
+ }
+
+ if ( $unix == -1 || $unix == false ) {
+ $invalidTime = true;
+ } else {
if ( $local ) {
# Use the time zone
if ( isset( $wgLocaltimezone ) ) {
@@ -427,6 +449,20 @@
} else {
$ts = wfTimestamp( TS_MW, $unix );
}
+ }
+ }
+
+ #format the timestamp and return the result
+ if ( $invalidTime ) {
+ wfLoadExtensionMessages( 'ParserFunctions' );
+ $result = '<strong class="error">' . wfMsgForContent( 'pfunc_time_error' ) . '</strong>';
+ } else {
+ $this->mTimeChars += strlen( $format );
+ if ( $this->mTimeChars > $this->mMaxTimeChars ) {
+ wfLoadExtensionMessages( 'ParserFunctions' );
+ return '<strong class="error">' . wfMsgForContent( 'pfunc_time_too_long' ) . '</strong>';
+ } else {
+
if ( method_exists( $wgContLang, 'sprintfDate' ) ) {
$result = $wgContLang->sprintfDate( $format, $ts );
} else {

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3848
Default Alt Text
patch2 (2 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL · Credits