? 6-validate.patch
? 6-x-conf-ignore.patch
? 652000-settings-b.patch
? 698566-domain-content.patch
? domain_content/README-698568.txt.patch
? domain_content/contributions-modules-domain-698566.patch
Index: domain_content/domain_content.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_content/domain_content.admin.inc,v
retrieving revision 1.15
diff -u -p -r1.15 domain_content.admin.inc
--- domain_content/domain_content.admin.inc	24 Oct 2009 16:18:52 -0000	1.15
+++ domain_content/domain_content.admin.inc	31 Jan 2010 23:12:23 -0000
@@ -195,8 +195,9 @@ function domain_content_form($form_state
   $message = FALSE;
   $set = 0;
   $all = FALSE;
+  $operations = FALSE;
   if (user_access('administer nodes') || user_access('set domain access')) {
-    $all = TRUE;
+    $operations = TRUE;
     $message = TRUE;
   }
   // Loop through the nodes to build the form
@@ -213,16 +214,17 @@ function domain_content_form($form_state
     $form['name'][$node->nid] =  array('#value' => check_plain(node_get_types('name', $node)));
     $form['username'][$node->nid] = array('#value' => theme('username', $node));
     $form['status'][$node->nid] =  array('#value' =>  ($node->status ? t('published') : t('not published')));
+
+    // Can the user edit this node.  We use += here since this is an array loop.
+    $check[$node->nid] += node_access('update', node_load($node->nid));
+
     // This routine controls if the editor can see the 'edit' link.
     // Load the domain_access rules directly from domain_nodeapi().
     domain_nodeapi($node, 'load');
 
     $node_domains = array();
-
     if (!empty($node->domains)) {
       foreach ($node->domains as $domain) {
-        // Can the user edit this node.  We use += here since this is an array loop.
-        $check[$node->nid] += domain_content_check($domain, $all);
         // The root domain is stored as -1, but cast as zero in the global variable.
         $key = ($domain == -1) ? 0 : $domain;
         // Convert the domain ids to data so we can print them.
@@ -298,7 +300,7 @@ function domain_content_form($form_state
     }
   }
   // Users must have passed at least one access check to have batch options.
-  if (!empty($check)) {
+  if (!empty($operations)) {
     $form['options'] = array('#type' => 'fieldset',
       '#title' => t('Update options'),
       '#prefix' => '<div class="container-inline">',
Index: domain_content/domain_content.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_content/domain_content.module,v
retrieving revision 1.30
diff -u -p -r1.30 domain_content.module
--- domain_content/domain_content.module	31 Oct 2009 19:29:50 -0000	1.30
+++ domain_content/domain_content.module	31 Jan 2010 23:12:23 -0000
@@ -47,7 +47,7 @@ function domain_content_menu() {
         'page callback' => 'domain_content_view',
         'page arguments' => array($domain['domain_id'], FALSE),
         'access callback' => 'domain_content_check',
-        'access arguments' => array($domain),
+        'access arguments' => array($domain['domain_id']),
         'file' => 'domain_content.admin.inc',
         'description' => 'View content assigned to '. filter_xss_admin($domain['subdomain']),
         'weight' => $domain['domain_id']
@@ -91,7 +91,7 @@ function domain_content_theme() {
   $themes = array(
     'domain_content_admin_nodes' => array(
       'arguments' => array('form' => array()),
-      'file'      => 'domain_content.admin.inc',
+      'file' => 'domain_content.admin.inc',
     ),
   );
   return $themes;
@@ -116,15 +116,15 @@ function domain_content_menu_check() {
 /**
  * Access checking routine for menu and node editing checks.
  *
- * @param $domain
- *  An array representing the currently active domain record.
+ * @param $domain_id
+ *   An id representing the currently active domain record.
  * @param $all
- *  A boolean flag indicating whether this user can access all domains.
+ *   A boolean flag indicating whether this user can access all domains.
  */
-function domain_content_check($domain, $all = FALSE) {
+function domain_content_check($domain_id, $all = FALSE) {
   global $user;
   // If the user can administer nodes, just return TRUE.
-  if ($all || user_access('administer nodes')) {
+  if ($all || user_access('administer nodes') || user_access('review content for all domains')) {
     return TRUE;
   }
   $rule = user_access('edit domain nodes');
@@ -136,11 +136,11 @@ function domain_content_check($domain, $
   $check = FALSE;
   $editor = FALSE;
   // Can this user see the default site?
-  if ($rule && $domain['domain_id'] == 0 && $domains['-1'] == -1) {
+  if ($rule && $domain_id == 0 && $domains['-1'] == -1) {
     $editor = TRUE;
   }
   // Can this user see the active site?
-  else if ($rule && $domain['domain_id'] > 0 && $domain['domain_id'] == $domains[$domain['domain_id']]) {
+  else if ($rule && $domain_id > 0 && $domain_id == $domains[$domain_id]) {
     $editor = TRUE;
   }
   if ($editor) {