Index: exhibit/exhibit.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/exhibit/exhibit.module,v
retrieving revision 1.6
diff -u -u -p -r1.6 exhibit.module
--- exhibit/exhibit.module	30 Sep 2008 12:40:51 -0000	1.6
+++ exhibit/exhibit.module	13 Oct 2008 12:46:55 -0000
@@ -381,7 +381,7 @@ function exhibit_get_url($url) {
         $url_parts['query'] = 'args='. $_GET['args'];
       }
     }
-    return url($url_parts['path'], array('query' => $url_parts['query']));
+    return url($url_parts['path'], array('query' => isset($url_parts['query']) ? $url_parts['query'] : ''));
   }
   else {
     return url($url, array('external' => TRUE));
Index: exhibit/contrib/exhibit_core/exhibit_core.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/exhibit/contrib/exhibit_core/exhibit_core.pages.inc,v
retrieving revision 1.4
diff -u -u -p -r1.4 exhibit_core.pages.inc
--- exhibit/contrib/exhibit_core/exhibit_core.pages.inc	17 Jul 2008 11:51:07 -0000	1.4
+++ exhibit/contrib/exhibit_core/exhibit_core.pages.inc	13 Oct 2008 12:46:55 -0000
@@ -10,7 +10,7 @@ function exhibit_core_get_users($role = 
     'created'    => array('valueType' => 'date'),
     'access'     => array('valueType' => 'date'),
     'login'      => array('valueType' => 'date'),
-    'url'        => array('valueType' => 'url'),
+    'uri'        => array('valueType' => 'url'),
   );
 
   // Make sure the current user is allowed to see user profile information.
@@ -37,7 +37,7 @@ function exhibit_core_get_users($role = 
       'login'       => gmstrftime(EXHIBIT_DATE_FORMAT, $user->login),
       'language'    => $user->language, // TODO: should probably be language label, not ID
       'roles'       => array_values($user->roles),
-      'url'         => url('user/' . $user->uid, array('absolute' => TRUE)),
+      'uri'         => url('user/' . $user->uid, array('absolute' => TRUE)),
     );
 
     // Add profile fields if the module is enabled
@@ -60,7 +60,7 @@ function exhibit_core_get_terms($vocabul
   $types  = array('taxonomy/term' => array('label' => t('Term'), 'pluralLabel' => t('Terms')));
   $fields = array(
     //'weight'     => array('valueType' => 'number'),
-    'url'        => array('valueType' => 'url'),
+    'uri'        => array('valueType' => 'url'),
   );
 
   $result = db_query('SELECT t.* FROM {term_data} t WHERE t.vid = %d ORDER BY t.name', $vocabulary->vid);
@@ -74,7 +74,7 @@ function exhibit_core_get_terms($vocabul
       'label'       => $term->name,
       'description' => $term->description,
       //'weight'      => (int)$term->weight, // TODO: needed for anything?
-      'url'         => url('taxonomy/term/' . $term->tid, array('absolute' => TRUE)),
+      'uri'         => url('taxonomy/term/' . $term->tid, array('absolute' => TRUE)),
     ));
   }
 
@@ -87,7 +87,7 @@ function exhibit_core_get_nodes($type = 
     'author'     => array('valueType' => 'item'),
     'created'    => array('valueType' => 'date'),
     'changed'    => array('valueType' => 'date'),
-    'url'        => array('valueType' => 'url'),
+    'uri'        => array('valueType' => 'url'),
   );
 
   $result = !$type ?
@@ -120,7 +120,7 @@ function exhibit_core_get_nodes($type = 
       'created'     => gmstrftime(EXHIBIT_DATE_FORMAT, $node->created),
       'changed'     => gmstrftime(EXHIBIT_DATE_FORMAT, $node->changed),
       'body'        => $node->teaser,
-      'url'         => url('node/' . $node->nid, array('absolute' => TRUE)),
+      'uri'         => url('node/' . $node->nid, array('absolute' => TRUE)),
       'terms'       => array_values(array_map('_exhibit_core_get_term_name', taxonomy_node_get_terms($node))),
     ));
   }