Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
domain-3393585
Manage
Activity
Members
Labels
Plan
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Issue forks
domain-3393585
Commits
92d99b62
Commit
92d99b62
authored
16 years ago
by
Ken Rickard
Browse files
Options
Downloads
Patches
Plain Diff
--
#280596
. Updates multiple_node_access.patch to Drupal 6.3.
parent
0ea6a737
No related branches found
Branches containing commit
Tags
5.x-1.5
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.txt
+4
-0
4 additions, 0 deletions
CHANGELOG.txt
patches/multiple_node_access.patch
+12
-12
12 additions, 12 deletions
patches/multiple_node_access.patch
with
16 additions
and
12 deletions
CHANGELOG.txt
+
4
−
0
View file @
92d99b62
// $Id$
25-JUL-2008 (5)
-- #280596. Updates multiple_node_access.patch to Drupal 6.3.
25-JUL-2008 (4)
-- #280908 by nirvanajyothi. Deprecates domain_disable(), which caused
...
...
This diff is collapsed.
Click to expand it.
patches/multiple_node_access.patch
+
12
−
12
View file @
92d99b62
--- modules/node/node.module
2008-0
4-09 17:11:48
.000000000 -0400
+++ modules/node/node.module.new
2008-0
6-01 09:30:29
.000000000 -0400
@@ -20
07
,22 +20
07
,19 @@
function node_access($op, $node, $accoun
--- modules/node/node.module
2008-0
7-25 10:23:51
.000000000 -0400
+++ modules/node/node.module.new
2008-0
7-25 10:24:37
.000000000 -0400
@@ -20
16
,22 +20
16
,19 @@
function node_access($op, $node, $accoun
// If the module did not override the access rights, use those set in the
// node_access table.
- if ($op != 'create' && $node->nid && $node->status) {
...
...
@@ -32,12 +32,12 @@
- $result = db_query($sql, $node->nid);
- return (db_result($result));
}
// Let authors view their own nodes.
@@ -20
72
,17 +20
69
,7 @@
function _node_access_where_sql($op = 'v
@@ -20
81
,17 +20
78
,7 @@
function _node_access_where_sql($op = 'v
return;
}
- $grants = array();
- foreach (node_access_grants($op, $account) as $realm => $gids) {
- foreach ($gids as $gid) {
...
...
@@ -50,12 +50,12 @@
- $grants_sql = 'AND ('. implode(' OR ', $grants) .')';
- }
+ $grants_sql = node_access_grants_sql($op, $node_access_alias, $account);
$sql = "$node_access_alias.grant_$op >= 1 $grants_sql";
return $sql;
@@ -212
0
,18 +21
07
,7 @@
function node_access_view_all_nodes() {
@@ -212
9
,18 +21
16
,7 @@
function node_access_view_all_nodes() {
static $access;
if (!isset($access)) {
- $grants = array();
- foreach (node_access_grants('view') as $realm => $gids) {
...
...
@@ -73,9 +73,9 @@
$sql = "SELECT COUNT(*) FROM {node_access} WHERE nid = 0 $grants_sql AND grant_view >= 1";
$result = db_query($sql);
$access = db_result($result);
@@ -21
41
,6 +21
17
,92 @@
function node_access_view_all_nodes() {
@@ -21
50
,6 +21
26
,92 @@
function node_access_view_all_nodes() {
}
/**
+ * Check the logic of node grants and prepare the SQL statement.
+ *
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment