diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-03-01 20:01:40 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-03-01 20:01:40 +0000 |
| commit | a4befbb68b03e1a44a4aea38d7db763f7ecddd3c (patch) | |
| tree | 7d0a548584d334e73e578d5b7cd7a7e4c4b905f8 | |
| parent | 365930732d0d20168d6ae1216484717f91d6536e (diff) | |
| download | brdo-a4befbb68b03e1a44a4aea38d7db763f7ecddd3c.tar.gz brdo-a4befbb68b03e1a44a4aea38d7db763f7ecddd3c.tar.bz2 | |
- Patch #18123 by chx: the $return['distinct'] in the past should have been module_implements('node_grants') but after JonBob's node_access_view_all_nodes, that part happens only if node_grants is in effect, so it is simplified to 1.
| -rw-r--r-- | modules/node.module | 10 | ||||
| -rw-r--r-- | modules/node/node.module | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/modules/node.module b/modules/node.module index bc0f77105..d9bf59def 100644 --- a/modules/node.module +++ b/modules/node.module @@ -1868,13 +1868,11 @@ function node_access($op, $node = NULL, $uid = NULL) { * An SQL join clause. */ function node_access_join_sql($node_alias = 'n', $node_access_alias = 'na') { - if (!module_implements('node_grants') || user_access('administer nodes')) { + if (user_access('administer nodes')) { return ''; } - $sql = 'INNER JOIN {node_access} '. $node_access_alias; - $sql .= ' ON '. $node_access_alias .'.nid = '. $node_alias .'.nid'; - return $sql; + return 'INNER JOIN {node_access} '. $node_access_alias .' ON '. $node_access_alias .'.nid = '. $node_alias .'.nid'; } /** @@ -1889,7 +1887,7 @@ function node_access_join_sql($node_alias = 'n', $node_access_alias = 'na') { * An SQL where clause. */ function node_access_where_sql($op = 'view', $node_access_alias = 'na', $uid = NULL) { - if (!module_implements('node_grants') || user_access('administer nodes')) { + if (user_access('administer nodes')) { return; } @@ -1961,7 +1959,7 @@ function node_db_rewrite_sql($query, $primary_table, $primary_field) { if ($primary_field == 'nid' && !node_access_view_all_nodes()) { $return['join'] = node_access_join_sql(); $return['where'] = node_access_where_sql(); - $return['distinct'] = !empty($return['join']); + $return['distinct'] = 1; return $return; } } diff --git a/modules/node/node.module b/modules/node/node.module index bc0f77105..d9bf59def 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1868,13 +1868,11 @@ function node_access($op, $node = NULL, $uid = NULL) { * An SQL join clause. */ function node_access_join_sql($node_alias = 'n', $node_access_alias = 'na') { - if (!module_implements('node_grants') || user_access('administer nodes')) { + if (user_access('administer nodes')) { return ''; } - $sql = 'INNER JOIN {node_access} '. $node_access_alias; - $sql .= ' ON '. $node_access_alias .'.nid = '. $node_alias .'.nid'; - return $sql; + return 'INNER JOIN {node_access} '. $node_access_alias .' ON '. $node_access_alias .'.nid = '. $node_alias .'.nid'; } /** @@ -1889,7 +1887,7 @@ function node_access_join_sql($node_alias = 'n', $node_access_alias = 'na') { * An SQL where clause. */ function node_access_where_sql($op = 'view', $node_access_alias = 'na', $uid = NULL) { - if (!module_implements('node_grants') || user_access('administer nodes')) { + if (user_access('administer nodes')) { return; } @@ -1961,7 +1959,7 @@ function node_db_rewrite_sql($query, $primary_table, $primary_field) { if ($primary_field == 'nid' && !node_access_view_all_nodes()) { $return['join'] = node_access_join_sql(); $return['where'] = node_access_where_sql(); - $return['distinct'] = !empty($return['join']); + $return['distinct'] = 1; return $return; } } |