From d4cc3984d3bf2caae7dc8938b1cba23e67cb3daa Mon Sep 17 00:00:00 2001
From: Kevin Decherf <kdecherf@gmail.com>
Date: Tue, 17 May 2011 11:13:45 +0200
Subject: [PATCH] Fixing c#4556: date_create with time==null and timezone causes NPE

---
 .../java/com/caucho/quercus/lib/date/DateTime.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/quercus/src/main/java/com/caucho/quercus/lib/date/DateTime.java b/quercus/src/main/java/com/caucho/quercus/lib/date/DateTime.java
index 1e77aa6..3c8cb55 100644
--- a/quercus/src/main/java/com/caucho/quercus/lib/date/DateTime.java
+++ b/quercus/src/main/java/com/caucho/quercus/lib/date/DateTime.java
@@ -84,6 +84,10 @@ public class DateTime {
    public static DateTime __construct(Env env,
            @Optional("now") String time,
            @Optional DateTimeZone timeZone) {
+      if (time == null) {
+         time = "now";
+      }
+      
       if (timeZone == null) {
          return new DateTime(env, time);
       } else {
-- 
1.7.1