From 41e3c76f0141248b4ca7c9a8a14c511f50c51058 Mon Sep 17 00:00:00 2001
From: michelvaldrighi <michelvaldrighi@git.wordpress.org>
Date: Mon, 23 Feb 2004 03:46:55 +0000
Subject: [PATCH] better get time_difference from get_settings than assume a
 global is set

git-svn-id: https://develop.svn.wordpress.org/trunk@915 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/functions-formatting.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/functions-formatting.php b/wp-includes/functions-formatting.php
index 62f9696fcb..a5cd0914d7 100644
--- a/wp-includes/functions-formatting.php
+++ b/wp-includes/functions-formatting.php
@@ -391,7 +391,7 @@ function wp_iso_descrambler($string) {
 
 // give it a date, it will give you the same date as GMT
 function get_gmt_from_date($string) {
-  global $time_difference;
+  $time_difference = get_settings('time_difference');
   // $string must be of the form 'yyyy-mm-dd hh:mm:ss'
   if ($string != gmdate('Y-m-d H:i:s')) {
     $string_time = gmmktime(substr($string,11,13), substr($string,14,16), substr($string,17,19), substr($string,5,7), substr($string,8,10), substr($string,0,4));