diff options
Diffstat (limited to 'modules/node.module')
| -rw-r--r-- | modules/node.module | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/node.module b/modules/node.module index da5134dff..571889a0f 100644 --- a/modules/node.module +++ b/modules/node.module @@ -1864,7 +1864,7 @@ function _node_rewrite_sql($query = '', $nid_alias = 'n', $args = array()) { function node_rewrite_sql($query, $nid_alias = 'n', $args = array()) { list($join, $where, $nid_to_select) = _node_rewrite_sql($query, $nid_alias, $args); - $query = preg_replace('/(SELECT.*)('. $nid_alias .'\.)?nid(.*FROM)/AUs', '\1'. $nid_to_select .'\3', $query); + $query = preg_replace('/(SELECT.*)('. $nid_alias .'\.)?(?<!DISTINCT\()(?<!DISTINCT\('. $nid_alias .'\.)nid(.*FROM)/AUsi', '\1'. $nid_to_select .'\3', $query); $query = preg_replace('|FROM[^[:upper:]/,]+|','\0 '.$join.' ', $query); if (strpos($query, 'WHERE')) { |