From 66773789e392305bba4cdf7ed8e6ae3b8380de51 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Thu, 27 Oct 2005 09:45:33 -0400
Subject: [PATCH]
---
program/include/main.inc | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index 0e20616..d00efc7 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -299,7 +299,7 @@
// update user's record
$DB->query("UPDATE ".get_table_name('users')."
- SET last_login=NOW()
+ SET last_login=now()
WHERE user_id=?",
$user_id);
}
@@ -336,7 +336,7 @@
$DB->query("INSERT INTO ".get_table_name('users')."
(created, last_login, username, mail_host, language)
- VALUES (NOW(), NOW(), ?, ?, ?)",
+ VALUES (now(), now(), ?, ?, ?)",
$user,
$host,
$_SESSION['user_lang']);
@@ -947,8 +947,10 @@
if (is_numeric($date))
$ts = $date;
- else
+ else if (!empty($date))
$ts = strtotime($date);
+ else
+ return '';
// convert time to user's timezone
$timestamp = $ts - date('Z', $ts) + ($CONFIG['timezone'] * 3600);
--
Gitblit v1.9.1