From a1789ddde42033f1b05cc4929491214ee6e79383 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 17 Dec 2015 09:15:42 +0100
Subject: Update to MediaWiki 1.26.0

---
 includes/MWTimestamp.php | 42 ++++++++++--------------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

(limited to 'includes/MWTimestamp.php')

diff --git a/includes/MWTimestamp.php b/includes/MWTimestamp.php
index ea91470e..d28f88e5 100644
--- a/includes/MWTimestamp.php
+++ b/includes/MWTimestamp.php
@@ -56,7 +56,7 @@ class MWTimestamp {
 	 *
 	 * @since 1.20
 	 *
-	 * @param bool|string $timestamp Timestamp to set, or false for current time
+	 * @param bool|string|int|float $timestamp Timestamp to set, or false for current time
 	 */
 	public function __construct( $timestamp = false ) {
 		$this->setTimestamp( $timestamp );
@@ -74,6 +74,7 @@ class MWTimestamp {
 	 * @throws TimestampException
 	 */
 	public function setTimestamp( $ts = false ) {
+		$m = array();
 		$da = array();
 		$strtime = '';
 
@@ -87,9 +88,9 @@ class MWTimestamp {
 			# TS_EXIF
 		} elseif ( preg_match( '/^(\d{4})(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/D', $ts, $da ) ) {
 			# TS_MW
-		} elseif ( preg_match( '/^-?\d{1,13}$/D', $ts ) ) {
+		} elseif ( preg_match( '/^(-?\d{1,13})(\.\d+)?$/D', $ts, $m ) ) {
 			# TS_UNIX
-			$strtime = "@$ts"; // http://php.net/manual/en/datetime.formats.compound.php
+			$strtime = "@{$m[1]}"; // http://php.net/manual/en/datetime.formats.compound.php
 		} elseif ( preg_match( '/^\d{2}-\d{2}-\d{4} \d{2}:\d{2}:\d{2}.\d{6}$/', $ts ) ) {
 			# TS_ORACLE // session altered to DD-MM-YYYY HH24:MI:SS.FF6
 			$strtime = preg_replace( '/(\d\d)\.(\d\d)\.(\d\d)(\.(\d+))?/', "$1:$2:$3",
@@ -199,42 +200,19 @@ class MWTimestamp {
 	 *
 	 * @since 1.20
 	 * @since 1.22 Uses Language::getHumanTimestamp to produce the timestamp
+	 * @deprecated since 1.26 Use Language::getHumanTimestamp directly
 	 *
-	 * @param MWTimestamp|null $relativeTo The base timestamp to compare to
-	 *   (defaults to now).
-	 * @param User|null $user User the timestamp is being generated for (or null
-	 *   to use main context's user).
-	 * @param Language|null $lang Language to use to make the human timestamp
-	 *   (or null to use main context's language).
+	 * @param MWTimestamp|null $relativeTo The base timestamp to compare to (defaults to now)
+	 * @param User|null $user User the timestamp is being generated for (or null to use main context's user)
+	 * @param Language|null $lang Language to use to make the human timestamp (or null to use main context's language)
 	 * @return string Formatted timestamp
 	 */
-	public function getHumanTimestamp( MWTimestamp $relativeTo = null,
-		User $user = null, Language $lang = null
-	) {
-		if ( $relativeTo === null ) {
-			$relativeTo = new self();
-		}
-		if ( $user === null ) {
-			$user = RequestContext::getMain()->getUser();
-		}
+	public function getHumanTimestamp( MWTimestamp $relativeTo = null, User $user = null, Language $lang = null ) {
 		if ( $lang === null ) {
 			$lang = RequestContext::getMain()->getLanguage();
 		}
 
-		// Adjust for the user's timezone.
-		$offsetThis = $this->offsetForUser( $user );
-		$offsetRel = $relativeTo->offsetForUser( $user );
-
-		$ts = '';
-		if ( Hooks::run( 'GetHumanTimestamp', array( &$ts, $this, $relativeTo, $user, $lang ) ) ) {
-			$ts = $lang->getHumanTimestamp( $this, $relativeTo, $user );
-		}
-
-		// Reset the timezone on the objects.
-		$this->timestamp->sub( $offsetThis );
-		$relativeTo->timestamp->sub( $offsetRel );
-
-		return $ts;
+		return $lang->getHumanTimestamp( $this, $relativeTo, $user );
 	}
 
 	/**
-- 
cgit v1.2.2