From 58767691f4d302a6efb0e6e64b7430b3eedb46f2 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 13 May 2011 19:17:07 +0000
Subject: [PATCH] Remove PHP5 back compat code from get_gmt_from_date. Props
 technosailor. fixes #16920

git-svn-id: http://svn.automattic.com/wordpress/trunk@17920 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/formatting.php | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 044a1309cb..758bc84184 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -1588,8 +1588,7 @@ function _wp_iso_convert( $match ) {
  *
  * Requires and returns a date in the Y-m-d H:i:s format. Simply subtracts the
  * value of the 'gmt_offset' option. Return format can be overridden using the
- * $format parameter. If PHP5 is supported, the function uses the DateTime and
- * DateTimeZone objects to respect time zone differences in DST.
+ * $format parameter. 
  *
  * @since 1.2.0
  *
@@ -1601,22 +1600,13 @@ function _wp_iso_convert( $match ) {
 function get_gmt_from_date($string, $format = 'Y-m-d H:i:s') {
 	preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches);
 	$tz = get_option('timezone_string');
-	if( class_exists('DateTime') && $tz ) {
-		//PHP5
-		date_default_timezone_set( $tz );
-		$datetime = new DateTime( $string );
-		$datetime->setTimezone( new DateTimeZone('UTC') );
-		$offset = $datetime->getOffset();
-		$datetime->modify( '+' . $offset / 3600 . ' hours');
-		$string_gmt = gmdate($format, $datetime->format('U'));
-
-		date_default_timezone_set('UTC');
-	}
-	else {
-		//PHP4
-		$string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
-		$string_gmt = gmdate($format, $string_time - get_option('gmt_offset') * 3600);
-	}
+	date_default_timezone_set( $tz );
+	$datetime = new DateTime( $string );
+	$datetime->setTimezone( new DateTimeZone('UTC') );
+	$offset = $datetime->getOffset();
+	$datetime->modify( '+' . $offset / 3600 . ' hours');
+	$string_gmt = gmdate($format, $datetime->format('U'));
+	date_default_timezone_set('UTC');
 	return $string_gmt;
 }