From 88a11fc7f58bd1ff1917b26ed97ba84e43113812 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 28 Mar 2007 19:14:24 +0000
Subject: [PATCH] Revert r20558: appears to be trying to treat symptoms of
 misformatted data being passed to Language::timeanddate(). Instead, find the
 bits that are passing raw database-format timestamps in there and make them
 normalize their data properly through wfTimestamp()

---
 RELEASE-NOTES          | 1 -
 languages/Language.php | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 909f1c8ab3..fd08cb5fb7 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -276,7 +276,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   image
 * (bug 8582) Allow thumbnailing when imagesize has a space.
 * (bug 8716) Change math_inputhash and math_outputhash to byte for Postgres
-* (bug 8558) Correct display of timestamps on some pages when using Postgres
 * (bug 9343) Correct internal name for Wolof language
 * (bug 9363) Fix Postgres error on Recentchangeslinked
 * (bug 5142) Fixed call of hook ArticleViewHeader
diff --git a/languages/Language.php b/languages/Language.php
index db2476728d..a23c3045ab 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -753,12 +753,6 @@ class Language {
 	*/
 	function timeanddate( $ts, $adj = false, $format = true, $timecorrection = false) {
 		$this->load();
-
-		## Account for non-integer timestamps
-		if (substr($ts,4,1) === '-') {
-			$ts = preg_replace('/\D/', '', $ts);
-		}
-
 		if ( $adj ) { 
 			$ts = $this->userAdjust( $ts, $timecorrection ); 
 		}
-- 
2.20.1