? contrib/.svn
? contrib/apachesolr_attachments/.svn
? contrib/apachesolr_image/.svn
? contrib/apachesolr_multisitesearch/.svn
? contrib/apachesolr_nodeaccess/.svn
? contrib/apachesolr_nodeaccess/tests/.svn
? contrib/apachesolr_og/.svn
Index: contrib/apachesolr_nodeaccess/apachesolr_nodeaccess.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/contrib/apachesolr_nodeaccess/apachesolr_nodeaccess.module,v
retrieving revision 1.1.2.9
diff -u -p -r1.1.2.9 apachesolr_nodeaccess.module
--- contrib/apachesolr_nodeaccess/apachesolr_nodeaccess.module	28 Apr 2009 23:36:13 -0000	1.1.2.9
+++ contrib/apachesolr_nodeaccess/apachesolr_nodeaccess.module	14 May 2009 19:09:44 -0000
@@ -37,6 +37,9 @@ function _apachesolr_nodeaccess_build_su
     throw new Exception('No access');
   }
   $node_access_query = apachesolr_drupal_query();
+  if (empty($node_access_query)) {
+    throw new Exception('No query object in apachesolr_nodeaccess');
+  }
   if (user_access('administer nodes', $account)) {
     // Access all content from the current site, or public content.
     $node_access_query->add_filter('nodeaccess_all', 0);
@@ -65,7 +68,7 @@ function apachesolr_nodeaccess_apachesol
   }
   catch (Exception $e) {
     $query = NULL;
-    watchdog("apachesolr_nodeaccess", 'User %name (UID:!uid) is not allowed to access any content', array('%name' => $user->name, '!uid' => $user->uid));
+    watchdog("apachesolr_nodeaccess", 'User %name (UID:!uid) cannot search: @message', array('%name' => $user->name, '!uid' => $user->uid, '@message' => $e->getMessage()));
     return;
   }