summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-08-15 15:32:44 +0200
committerAleksander Machniak <alec@alec.pl>2012-08-15 15:32:44 +0200
commit38ea9af1e685aeb89b5823e59ccd2c8fb481162c (patch)
tree7ffc4941d4d5128cc8517f03fd6a21ae6d44dc44
parentfb2f825cd95677a2ede38e0a2ea99b6823841d74 (diff)
parent0db8d00d298f8f67d6843f016a5a6259edff9f96 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
-rw-r--r--program/include/rcube_db.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/program/include/rcube_db.php b/program/include/rcube_db.php
index 042ca15e4..f97d70ab3 100644
--- a/program/include/rcube_db.php
+++ b/program/include/rcube_db.php
@@ -576,6 +576,10 @@ class rcube_db
return intval($input);
}
+ if (is_null($input)) {
+ return 'NULL';
+ }
+
// create DB handle if not available
if (!$this->dbh) {
$this->db_connect('r');