[geeklog-cvs] geeklog: Fixed an SQL error when returning search results for th...

[geeklog-cvs at lists.geeklog.net]

changeset 8001:be281d9fa515
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/be281d9fa515
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 31 09:43:15 2010 +0100
description:
Fixed an SQL error when returning search results for the Personal Calendar (bug #0001195)

diffstat:

 plugins/calendar/functions.inc |  2 +-
 public_html/docs/history       |  5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r 01118a0e21f0 -r be281d9fa515 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sat Oct 30 22:11:30 2010 +0200
+++ b/plugins/calendar/functions.inc	Sun Oct 31 09:43:15 2010 +0100
@@ -1698,7 +1698,7 @@
     $sql_e .= "CONCAT('/calendar/event.php?eid=',eid) AS url ";
     $sql_e .= "FROM {$_TABLES['events']} WHERE 1=1 ";
 
-    $sql_p = "SELECT eid AS id, title, description, UNIX_TIMESTAMP(datestart) AS date, owner_id AS uid, ";
+    $sql_p = "SELECT eid AS id, title, description, UNIX_TIMESTAMP(datestart) AS date, owner_id AS uid, 0 AS hits, ";
     $sql_p .= "CONCAT('/calendar/event.php?mode=personal&eid=',eid) AS url ";
     $sql_p .= "FROM {$_TABLES['personal_events']} WHERE (uid = $uid) ";
 
diff -r 01118a0e21f0 -r be281d9fa515 public_html/docs/history
--- a/public_html/docs/history	Sat Oct 30 22:11:30 2010 +0200
+++ b/public_html/docs/history	Sun Oct 31 09:43:15 2010 +0100
@@ -15,6 +15,11 @@
 - Updated Italian language files for the Static Pages plugin, provided by
   Rouslan Placella
 
+Calendar Plugin
+---------------
+- Fixed an SQL error when returning search results for the Personal Calendar
+  (bug #0001195) [Dirk]
+
 
 Oct 10, 2010 (1.7.1rc1)
 ------------