? .svn
? SolrPhpClient
? contrib/.svn
? contrib/apachesolr_image/.svn
? contrib/apachesolr_nodeaccess/.svn
? contrib/apachesolr_nodeaccess/tests/.svn
? contrib/apachesolr_og/.svn
? tests/.svn
Index: Solr_Base_Query.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/Solr_Base_Query.php,v
retrieving revision 1.1.4.36
diff -u -p -r1.1.4.36 Solr_Base_Query.php
--- Solr_Base_Query.php	18 Jun 2009 20:45:36 -0000	1.1.4.36
+++ Solr_Base_Query.php	26 Jun 2009 12:45:19 -0000
@@ -262,14 +262,23 @@ class Solr_Base_Query implements Drupal_
    * Return filters and sort in a form suitable for a query param to url().
    */
   public function get_url_querystring() {
-    $querystring = '';
+    $query = array();
+
     if ($fq = $this->rebuild_fq(TRUE)) {
-      $querystring = 'filters='. rawurlencode(implode(' ', $fq));
+      $query[] = 'filters=' . rawurlencode(implode(' ', $fq));
     }
     if ($this->solrsort) {
-      $querystring .= ($querystring ? '&' : '') .'solrsort='. rawurlencode($this->solrsort);
+      $query[] = 'solrsort='. rawurlencode($this->solrsort);
+    }
+
+    // Any other stuff in $_GET belongs here, too...
+    $values = array_filter($_GET, 'check_plain');
+    // ... with the exception of "q".
+    $excludes = array('q');
+    if ($get_params = drupal_query_string_encode($values, $excludes)) {
+      $query[] = $get_params;
     }
-    return $querystring;
+    return implode('&', $query);
   }
 
   public function get_fq() {
@@ -283,7 +292,7 @@ class Solr_Base_Query implements Drupal_
   public function get_query_basic() {
     return $this->rebuild_query();
   }
-  
+
   /**
    * Return the search path.
    *