Update to MediaWiki 1.25.1

1 files changed, 7 insertions, 2 deletions

diff --git a/includes/MWTimestamp.php b/includes/MWTimestamp.php
index 26f5e543..ea91470e 100644
--- a/includes/MWTimestamp.php
+++ b/includes/MWTimestamp.php
@@ -182,6 +182,11 @@ class MWTimestamp {
 			$output .= ' GMT';
 		}
 
+		if ( $style == TS_MW && strlen( $output ) !== 14 ) {
+			throw new TimestampException( __METHOD__ . ': The timestamp cannot be represented in ' .
+				'the specified format' );
+		}
+
 		return $output;
 	}
 
@@ -221,7 +226,7 @@ class MWTimestamp {
 		$offsetRel = $relativeTo->offsetForUser( $user );
 
 		$ts = '';
-		if ( wfRunHooks( 'GetHumanTimestamp', array( &$ts, $this, $relativeTo, $user, $lang ) ) ) {
+		if ( Hooks::run( 'GetHumanTimestamp', array( &$ts, $this, $relativeTo, $user, $lang ) ) ) {
 			$ts = $lang->getHumanTimestamp( $this, $relativeTo, $user );
 		}
 
@@ -326,7 +331,7 @@ class MWTimestamp {
 
 		$ts = '';
 		$diff = $this->diff( $relativeTo );
-		if ( wfRunHooks(
+		if ( Hooks::run(
 			'GetRelativeTimestamp',
 			array( &$ts, &$diff, $this, $relativeTo, $user, $lang )
 		) ) {