From 7c0c45982dc342aac40e1106b3895a3044508516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Sjo=CC=88kvist?= Date: Thu, 2 Dec 2010 17:05:54 +0100 Subject: [PATCH] Fix for node resource index. --- resources/node_resource.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/resources/node_resource.inc b/resources/node_resource.inc index eeac2cc..5f75a9b 100644 --- a/resources/node_resource.inc +++ b/resources/node_resource.inc @@ -279,6 +279,11 @@ function _node_resource_index($page = 0, $fields = '*', $parameters = array()) { $parameters = (array) $parameters; $schema = drupal_get_schema('node'); $where = array(); + + if (empty($fields)) { + $fields = '*'; + } + $fields = db_escape_string($fields); @@ -298,7 +303,7 @@ function _node_resource_index($page = 0, $fields = '*', $parameters = array()) { $where = !empty($where) ? ' WHERE '. db_escape_string(implode(' AND ', $where)) : ''; // Run through db_rewrite_sql to make sure proper access checks are applied. - $sql = "SELECT $fields FROM {node} $where ORDER BY sticky DESC, created DESC"; + $sql = "SELECT $fields FROM {node} n $where ORDER BY sticky DESC, created DESC"; $sql = db_rewrite_sql($sql); $result = db_query_range($sql, $parameters, $page * 20, 20);