cvs: pear /Date/Date Span.php

firman		Tue May  6 17:11:15 2008 UTC

  Modified files:              
    /pear/Date/Date	Span.php 
  Log:
  Fixing bug #13545: Date_Span::set() doesn't recognize the format when the $time is integer.
  
http://cvs.php.net/viewvc.cgi/pear/Date/Date/Span.php?r1=1.15&r2=1.16&diff_format=u
Index: pear/Date/Date/Span.php
diff -u pear/Date/Date/Span.php:1.15 pear/Date/Date/Span.php:1.16
--- pear/Date/Date/Span.php:1.15	Thu Nov 29 19:26:08 2007
+++ pear/Date/Date/Span.php	Tue May  6 17:11:15 2008
@@ -36,7 +36,7 @@
  * @copyright  1997-2006 Leandro Lucarella, Pierre-Alain Joye
  * @license    http://www.opensource.org/licenses/bsd-license.php
  *             BSD License
- * @version    CVS: $Id: Span.php,v 1.15 2007/11/29 19:26:08 c01234 Exp $
+ * @version    CVS: $Id: Span.php,v 1.16 2008/05/06 17:11:15 firman Exp $
  * @link       http://pear.php.net/package/Date
  * @since      File available since Release 1.4
  */
@@ -109,7 +109,7 @@
  * @copyright 1997-2006 Leandro Lucarella, Pierre-Alain Joye
  * @license   http://www.opensource.org/licenses/bsd-license.php
  *            BSD License
- * @version   Release: @package_version@
+ * @version   Release: 1.5.0a1
  * @link      http://pear.php.net/package/Date
  * @since     Class available since Release 1.4
  */
@@ -205,6 +205,9 @@
         } elseif (is_string($time)) {
             return $this->setFromString($time, $format);
         } elseif (is_int($time)) {
+            if (is_string($format)) {
+                return $this->setFromString((string) $time, $format);
+            }
             return $this->setFromSeconds($time);
         } else {
             return $this->setFromSeconds(0);