From 99d9f50a0000447d0a752e6c43716237dc0da176 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sun, 09 Sep 2012 14:23:56 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

---
 program/include/rcube_db.php |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/program/include/rcube_db.php b/program/include/rcube_db.php
index 042ca15..f97d70a 100644
--- a/program/include/rcube_db.php
+++ b/program/include/rcube_db.php
@@ -576,6 +576,10 @@
             return intval($input);
         }
 
+        if (is_null($input)) {
+            return 'NULL';
+        }
+
         // create DB handle if not available
         if (!$this->dbh) {
             $this->db_connect('r');

--
Gitblit v1.9.1