From 83a64265a7d8865f0381e53a0cc47d6ef53217b6 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 15 Sep 2014 11:37:42 +0200
Subject: Fixes for Oracle

---
 program/lib/Roundcube/rcube_db_oracle.php | 2 +-
 program/lib/Roundcube/rcube_user.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/program/lib/Roundcube/rcube_db_oracle.php b/program/lib/Roundcube/rcube_db_oracle.php
index 95a7fa2c4..ddd351ec3 100644
--- a/program/lib/Roundcube/rcube_db_oracle.php
+++ b/program/lib/Roundcube/rcube_db_oracle.php
@@ -141,7 +141,7 @@ class rcube_db_oracle extends rcube_db
     {
         if ($interval) {
             $interval = intval($interval);
-            return "current_timestamp + INTERVAL $interval SECOND";
+            return "current_timestamp + INTERVAL '$interval' SECOND";
         }
 
         return "current_timestamp";
diff --git a/program/lib/Roundcube/rcube_user.php b/program/lib/Roundcube/rcube_user.php
index b63cabece..b2110df8b 100644
--- a/program/lib/Roundcube/rcube_user.php
+++ b/program/lib/Roundcube/rcube_user.php
@@ -341,7 +341,7 @@ class rcube_user
             $insert_cols[]   = $this->db->quote_identifier($col);
             $insert_values[] = $value;
         }
-        $insert_cols[]   = 'user_id';
+        $insert_cols[]   = $this->db->quote_identifier('user_id');
         $insert_values[] = $this->ID;
 
         $sql = "INSERT INTO ".$this->db->table_name('identities', true).
-- 
cgit v1.2.3