From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Thu, 30 Sep 2010 21:32:19 +0000 (+0000)
Subject: Fixed bug in r74043 where a : was left out of a regex for matching timestamps to... 
X-Git-Tag: 1.31.0-rc.0~34720
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=26ac81873900727b571bd28926c2dbbb037cce25;p=lhc%2Fweb%2Fwiklou.git

Fixed bug in r74043 where a : was left out of a regex for matching timestamps to TS_ISO_8691_BASIC
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 93dd56b385..0e00c69365 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1990,7 +1990,7 @@ function wfTimestamp( $outputtype = TS_UNIX, $ts = 0 ) {
 				str_replace( '+00:00', 'UTC', $ts ) ) );
 	} elseif ( preg_match( '/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.*\d*)?Z$/', $ts, $da ) ) {
 		# TS_ISO_8601
-	} elseif ( preg_match( '/^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})(?\.*\d*)?Z$/', $ts, $da ) ) {
+	} elseif ( preg_match( '/^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})(?:\.*\d*)?Z$/', $ts, $da ) ) {
 		#TS_ISO_8601_BASIC
 	} elseif ( preg_match( '/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)\.*\d*[\+\- ](\d\d)$/', $ts, $da ) ) {
 		# TS_POSTGRES