Permalink
Browse files

BackwardsCompatibilityBreak - Removed fTimestamp::combine()

  • Loading branch information...
wbond committed Oct 14, 2008
1 parent 25a7e08 commit e4089f17ec642f2a752d6bb920c3d65f8d03cbcc
Showing with 2 additions and 16 deletions.
  1. +2 −16 classes/fTimestamp.php
View
@@ -79,22 +79,6 @@ static private function checkPHPVersion()
}
/**
* Creates an fTimestamp object from fDate, fTime objects and optionally a timezone
*
* @throws fValidationException
*
* @param fDate $date The date to combine
* @param fTime $time The time to combine
* @param string $timezone The timezone for the date/time. This causes the date/time to be interpretted as being in the specified timezone. . If not specified, will default to timezone set by {@link fTimestamp::setDefaultTimezone()}.
* @return fTimestamp
*/
static public function combine(fDate $date, fTime $time, $timezone=NULL)
{
return new fTimestamp($date . ' ' . $time, $timezone);
}
/**
* Creates a reusable format for formatting fDate/fTime/fTimestamp
*
@@ -164,6 +148,8 @@ static public function getSeconds($timespan)
/**
* Checks to see if a timezone is valid
*
* @internal
*
* @param string $timezone The timezone to check
* @return boolean If the timezone is valid
*/

0 comments on commit e4089f1

Please sign in to comment.