Index: contrib/luceneapi_facet/luceneapi_facet.block.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/luceneapi/contrib/luceneapi_facet/luceneapi_facet.block.inc,v
retrieving revision 1.1.2.18
diff -r1.1.2.18 luceneapi_facet.block.inc
123d122
<           'path' => $_GET['q'],
132c131
<     // adds facet counds, determines which theme function to use
---
>     // adds facet counts, determines which theme function to use
135,137d133
<       $qstring = $_GET;
< 
<       // gets theme function, link path, and finalizes count
140,145d135
<         if (empty($qstring[$item['element']]) || is_array($qstring[$item['element']])) {
<           $qstring[$item['element']][$value] = $value;
<         }
<         else {
<           $qstring[$item['element']] = array($value => $value);
<         }
151,156d140
<         if (is_array($qstring[$item['element']])) {
<           unset($qstring[$item['element']][$value]);
<         }
<         else {
<           unset($qstring[$item['element']]);
<         }
159,161d142
<       // adds query string to options
<       $options['query'] = drupal_query_string_encode($qstring, array('q', 'page'));
< 
166d146
<         'path' => $_GET['q'],
Index: contrib/luceneapi_facet/luceneapi_facet.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/luceneapi/contrib/luceneapi_facet/luceneapi_facet.module,v
retrieving revision 1.1.2.62
diff -r1.1.2.62 luceneapi_facet.module
926,927c926,929
<     foreach ($item['items'] as $option => $args) {
<       $item['items'][$option] = call_user_func_array('theme', $args);
---
>     foreach ($item['items'] as $value => $args) {
>       $item['items'][$value] = theme(
>         $args['function'], $args['text'], $args['path'], $args['options'], $args['count']
>       );
1061a1064,1098
>     // Adds query string variables.  We don't want query string data to be
>     // cached otherwise the sort data won't persist.
>     // @see http://drupal.org/node/664440
>     foreach ($items as $name => $item) {
>       foreach ($item['count'] as $value => $count) {
>         if ($count) {
>           $qstring = $_GET;
>           if (!isset($item['selected'][$value])) {
>             if (empty($qstring[$item['element']]) || is_array($qstring[$item['element']])) {
>               $qstring[$item['element']][$value] = $value;
>             }
>             else {
>               $qstring[$item['element']] = array($value => $value);
>             }
>           }
>           else {
>             if (is_array($qstring[$item['element']])) {
>               unset($qstring[$item['element']][$value]);
>             }
>             else {
>               unset($qstring[$item['element']]);
>             }
>           }
> 
>           // formats the query string, adds to options
>           $items[$name]['items'][$value]['options']['query'] = drupal_query_string_encode(
>             $qstring, array('q', 'page')
>           );
>         }
> 
>         // sets current page as the link's path
>         $items[$name]['items'][$value]['path'] = $_GET['q'];
>       }
>     }
>