From 4e89c8851917c4b831a11d4834c224f8aa078e76 Mon Sep 17 00:00:00 2001 From: Mariano D'Agostino Date: Tue, 18 Aug 2015 00:36:44 -0300 Subject: [PATCH] Issue #2035035: replace the use of NOW() for better compatibility with sqlite --- advpoll.module | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/advpoll.module b/advpoll.module index 0d67e88..50b8ce3 100644 --- a/advpoll.module +++ b/advpoll.module @@ -891,6 +891,8 @@ function advpoll_get_recent() { $loaded_node = menu_get_object(); $node = ''; + // NOW() is not available on sqlite + $now = date("Y-m-d H:i:s"); $result = db_query("SELECT n.nid FROM {node} n LEFT JOIN {field_data_advpoll_dates} d ON d.revision_id = n.vid @@ -907,10 +909,10 @@ function advpoll_get_recent() { n.type = 'advpoll' AND n.status = 1 AND c.advpoll_closed_value = 'open' AND - d.advpoll_dates_value < NOW() AND - d.advpoll_dates_value2 > NOW() + d.advpoll_dates_value < :now AND + d.advpoll_dates_value2 > :now ORDER BY n.created DESC - LIMIT 1"); + LIMIT 1", array(':now' => $now)); if ($result) { foreach ($result as $record) { $node = node_load($record->nid); @@ -942,6 +944,8 @@ function advpoll_get_recent() { * Block object */ function advpoll_get_poll_info_blocks($blocks) { + // NOW() is not available on sqlite + $now = date("Y-m-d H:i:s"); $result = db_query("SELECT n.title, n.nid FROM {node} n LEFT JOIN {field_data_advpoll_dates} d ON d.revision_id = n.vid @@ -954,9 +958,9 @@ function advpoll_get_poll_info_blocks($blocks) { o.advpoll_options_value = 'block' AND n.status = 1 AND c.advpoll_closed_value = 'open' AND - d.advpoll_dates_value < NOW() - AND d.advpoll_dates_value2 > NOW() - ORDER BY n.created DESC"); + d.advpoll_dates_value < :now + AND d.advpoll_dates_value2 > :now + ORDER BY n.created DESC", array(':now' => $now)); if ($result) { foreach ($result as $record) { -- 1.9.1