Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
domain-3331733
Manage
Activity
Members
Labels
Plan
Custom issue tracker
Code
Merge requests
0
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-3331733
Commits
6ed0477a
Commit
6ed0477a
authored
13 years ago
by
Ken Rickard
Browse files
Options
Downloads
Patches
Plain Diff
-- Issue
#1080840
by gineta. Fixes bad index in domain_node_load().
parent
d2fc531d
No related branches found
Branches containing commit
Tags
7.x-2.12
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.txt
+3
-0
3 additions, 0 deletions
CHANGELOG.txt
domain.module
+3
-2
3 additions, 2 deletions
domain.module
with
6 additions
and
2 deletions
CHANGELOG.txt
+
3
−
0
View file @
6ed0477a
...
...
@@ -3,6 +3,9 @@
* Changelog file for Domain Access 7.x-2.x branch
*/
11-MAR-2011
-- Issue #1080840 by gineta. Fixes bad index in domain_node_load().
09-MAR-2011
-- Issue #1086048 by ununpentium, cgross. Bad hook call in domain_save().
-- Issue #1086886 by GalainHH. Bad variable check in domain_conf_block_view().
...
...
This diff is collapsed.
Click to expand it.
domain.module
+
3
−
2
View file @
6ed0477a
...
...
@@ -1458,8 +1458,9 @@ function domain_node_load($nodes, $types) {
continue
;
}
// Append the domain grants to the node for editing.
$nodes
[
$node
->
nid
]
->
domains
=
$domains
[
$node
->
nid
][
'domain_id'
];
$nodes
[
$node
->
nid
]
->
domain_site
=
$domains
[
$node
->
nid
][
'domain_site'
];
$nodes
[
$node
->
nid
]
->
domains
=
isset
(
$domains
[
$node
->
nid
][
'domain_id'
])
?
$domains
[
$node
->
nid
][
'domain_id'
]
:
array
();
// If the node is not assigned, grant to all domains to prevent errors.
$nodes
[
$node
->
nid
]
->
domain_site
=
isset
(
$domains
[
$node
->
nid
][
'domain_site'
])
?
$domains
[
$node
->
nid
][
'domain_site'
]
:
variable_get
(
'domain_behavior'
,
DOMAIN_INSTALL_RULE
);
$nodes
[
$node
->
nid
]
->
subdomains
=
array
();
if
(
!
empty
(
$nodes
[
$node
->
nid
]
->
domain_site
))
{
$nodes
[
$node
->
nid
]
->
subdomains
[]
=
t
(
'All affiliates'
);
...
...
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