[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[26621] branches/5.x/lib

[<jon...@us...>]

Revision: 26621
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=26621&view=rev
Author:   jonnybradley
Date:     2010-04-14 15:14:28 +0000 (Wed, 14 Apr 2010)

Log Message:
-----------
[MOD] Change calls to convertTZByID over to use setTZbyID (as these functions have been identical since before php 5)

Modified Paths:
--------------
    branches/5.x/lib/tikilib.php
    branches/5.x/lib/wiki-plugins/wikiplugin_countdown.php

Modified: branches/5.x/lib/tikilib.php
===================================================================
--- branches/5.x/lib/tikilib.php	2010-04-14 15:12:12 UTC (rev 26620)
+++ branches/5.x/lib/tikilib.php	2010-04-14 15:14:28 UTC (rev 26621)
@@ -7633,7 +7633,7 @@
 
 		// If user timezone is not also in UTC, convert the date
 		if ( $tz != 'UTC' ) {
-			$tikidate->convertTZByID($tz);
+			$tikidate->setTZbyID($tz);
 		}
 
 		return $tikidate->format($format, $is_strftime_format);

Modified: branches/5.x/lib/wiki-plugins/wikiplugin_countdown.php
===================================================================
--- branches/5.x/lib/wiki-plugins/wikiplugin_countdown.php	2010-04-14 15:12:12 UTC (rev 26620)
+++ branches/5.x/lib/wiki-plugins/wikiplugin_countdown.php	2010-04-14 15:14:28 UTC (rev 26621)
@@ -111,7 +111,7 @@
 	//  (the string was specified using the user timezone)
 	$tikidate->setTZbyID($tikilib->get_display_timezone());
 	$tikidate->setDate($then);
-	$tikidate->convertTZByID('UTC');
+	$tikidate->setTZbyID('UTC');
 	$then = $tikidate->getTime();
 
 	$difference = $then - $tikilib->now;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.