Skip to content
Snippets Groups Projects
Commit 6ed0477a authored by Ken Rickard's avatar Ken Rickard
Browse files

-- Issue #1080840 by gineta. Fixes bad index in domain_node_load().

parent d2fc531d
No related branches found
Tags 7.x-3.0
No related merge requests found
......@@ -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().
......
......@@ -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');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment