From 728588128b08b1493720b222b6305fa71ae88846 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Wed, 21 Sep 2016 21:46:24 -0700 Subject: [PATCH] Use ConvertibleTimestamp::convert() in a few places Change-Id: I9da31cd96fa7afa5cfccbbc204fb446fdb1a3c65 --- includes/libs/rdbms/database/Database.php | 8 +------- includes/libs/xmp/XMPValidate.php | 6 +++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index d3c9d5798f..4f702c1e89 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -3458,13 +3458,7 @@ abstract class Database implements IDatabase, LoggerAwareInterface { return 'infinity'; } - try { - $t = new ConvertibleTimestamp( $expiry ); - - return $t->getTimestamp( $format ); - } catch ( TimestampException $e ) { - return false; - } + return ConvertibleTimestamp::convert( $format, $expiry ); } public function setBigSelects( $value = true ) { diff --git a/includes/libs/xmp/XMPValidate.php b/includes/libs/xmp/XMPValidate.php index aaf649104c..31eaa3baa7 100644 --- a/includes/libs/xmp/XMPValidate.php +++ b/includes/libs/xmp/XMPValidate.php @@ -329,15 +329,15 @@ class XMPValidate implements LoggerAwareInterface { // We know that if we got to this step, year, month day hour and min must be set // by virtue of regex not failing. - $unix = ( new ConvertibleTimestamp( + $unix = ConvertibleTimestamp::convert( TS_UNIX, $res[1] . $res[2] . $res[3] . $res[4] . $res[5] . $res[6] - ) )->getTimestamp( TS_UNIX ); + ); $offset = intval( substr( $res[7], 1, 2 ) ) * 60 * 60; $offset += intval( substr( $res[7], 4, 2 ) ) * 60; if ( substr( $res[7], 0, 1 ) === '-' ) { $offset = -$offset; } - $val = ( new ConvertibleTimestamp( $unix + $offset ) )->getTimestamp( TS_EXIF ); + $val = ConvertibleTimestamp::convert( TS_EXIF, $unix + $offset ); if ( $stripSeconds ) { // If seconds weren't specified, remove the trailing ':00'. -- 2.20.1