? SolrPhpClient
Index: schema.xml
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/schema.xml,v
retrieving revision 1.1.2.1.2.33
diff -u -p -r1.1.2.1.2.33 schema.xml
--- schema.xml	29 Jul 2009 18:17:13 -0000	1.1.2.1.2.33
+++ schema.xml	14 Aug 2009 21:57:27 -0000
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<<<<<<< schema.xml
+<!-- $Id: schema.xml,v 1.1.2.1.2.32 2009/06/12 18:26:34 pwolanin Exp $ -->
+=======
 <!-- $Id: schema.xml,v 1.1.2.1.2.33 2009/07/29 18:17:13 pwolanin Exp $ -->
+>>>>>>> 1.1.2.1.2.33
 
 <!--
  This is the Solr schema file. This file should be named "schema.xml" and
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.11
diff -u -p -r1.1.2.11 apachesolr_nodeaccess.module
--- contrib/apachesolr_nodeaccess/apachesolr_nodeaccess.module	5 Jun 2009 18:05:06 -0000	1.1.2.11
+++ contrib/apachesolr_nodeaccess/apachesolr_nodeaccess.module	14 Aug 2009 21:57:27 -0000
@@ -61,7 +61,10 @@ function _apachesolr_nodeaccess_build_su
 /**
  * Implementation of hook_apachesolr_modify_query().
  */
-function apachesolr_nodeaccess_apachesolr_modify_query(&$query, &$params) {
+function apachesolr_nodeaccess_apachesolr_modify_query(&$query, &$params, $caller = 'apachesolr_search') {
+  if ($caller == 'apachesolr_views_query') {
+    return;
+  }
   global $user;
   try {
     $subquery = _apachesolr_nodeaccess_build_subquery($user);