derick          Fri May  2 21:33:06 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src    NEWS 
    /php-src/ext/date   php_date.c 
  Log:
  - MFH: Fixed an issue in date() where a : was printed for the O modifier after
    a P modifier was used.
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.167&r2=1.2027.2.547.2.965.2.168&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.167 
php-src/NEWS:1.2027.2.547.2.965.2.168
--- php-src/NEWS:1.2027.2.547.2.965.2.167       Thu May  1 00:12:24 2008
+++ php-src/NEWS        Fri May  2 21:33:05 2008
@@ -160,6 +160,8 @@
   to different characters with cp1251 and cp866. (Scott)
 - Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf)
 - Fixed PECL bug #12431 (OCI8 ping functionality is broken). (Oracle Corp.)
+- Fixed an issue in date() where a : was printed for the O modifier after a P
+  modifier was used. (Derick)
 
 - Fixed bug #44805 (rename() function is not portable to Windows). (Pierre)
 - Fixed bug #44742 (timezone_offset_get() causes segmentation faults). (Derick)
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.34&r2=1.43.2.45.2.51.2.35&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.34 
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.35
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.34     Fri May  2 12:49:16 2008
+++ php-src/ext/date/php_date.c Fri May  2 21:33:05 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.34 2008/05/02 12:49:16 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.35 2008/05/02 21:33:05 derick Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -805,7 +805,7 @@
        char                 buffer[33];
        timelib_time_offset *offset = NULL;
        timelib_sll          isoweek, isoyear;
-       int                  rfc_colon = 0;
+       int                  rfc_colon;
 
        if (!format_len) {
                return estrdup("");
@@ -835,6 +835,7 @@
        timelib_isoweek_from_date(t->y, t->m, t->d, &isoweek, &isoyear);
 
        for (i = 0; i < format_len; i++) {
+               rfc_colon = 0;
                switch (format[i]) {
                        /* day */
                        case 'd': length = slprintf(buffer, 32, "%02d", (int) 
t->d); break;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to