Index: flickr_gallery.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flickr_gallery/flickr_gallery.module,v
retrieving revision 1.1
diff -u -r1.1 flickr_gallery.module
--- flickr_gallery.module	29 Oct 2007 03:11:07 -0000	1.1
+++ flickr_gallery.module	25 Feb 2008 04:15:37 -0000
@@ -64,13 +64,13 @@
 	$form['flickr_gallery_vocabulary'] = array(
 		'#type' => 'select',
 		'#title' => 'Select the vocabulary used to categorize photos',
-//		'#default_value' => _flickr_gallery_get_vid(),
-		'#default_value' => variable_get('flickr_gallery_vocabulary',''),
+		'#default_value' => _flickr_gallery_get_vid(),
+//		'#default_value' => variable_get('flickr_gallery_vocabulary',''),
 		'#options' => _get_image_vocabularies(),
 		'#description' => t('Select the name of the vocabulary that will be used to categorize your photos'),
 	);
 	
-	$form['flickr_gallery_view_vocabulary'] = array(
+	$form['flickr_gallery_view_category'] = array(
 		'#type' => 'select',
 		'#title' => 'Select the view used to display photos by category',
 		'#default_value' => variable_get('flickr_gallery_view_category','photos/tags'),	
@@ -154,7 +154,7 @@
  */
 function _flickr_gallery_display_categories() {
 	if (module_exists(taxonomy_list)) {
-//		$vid = _flickr_gallery_get_vid();
+		$vid = _flickr_gallery_get_vid();
 		$vid = variable_get('flickr_gallery_vocabulary', '');
 		$output = taxonomy_list_show($vid);
 	}
@@ -167,7 +167,7 @@
 function _flickr_gallery_display_users() {
 	$rid = variable_get('flickr_gallery_upload_role',1);
 	$user_path = variable_get('flickr_gallery_view_user','photos/user');
-	$term_path = variable_get('flickr_gallery_view_vocabulary','photos/tags');
+	$term_path = variable_get('flickr_gallery_view_category','photos/tags');
 	
 	$output = '';
 	//create table headers
@@ -223,8 +223,8 @@
       $tid = str_replace('taxonomy/term/', '', $link['href']);
       $term = taxonomy_get_term($tid);
       $url = variable_get('flickr_gallery_view_category','photos/tags');
-//    if ($term->vid == _flickr_gallery_get_vid()) {
-			if ($term->vid == variable_get('flickr_gallery_vocabulary', '')) {
+	    if ($term->vid == _flickr_gallery_get_vid()) {
+//		if ($term->vid == variable_get('flickr_gallery_vocabulary', '')) {
         $links[$module]['href'] = str_replace('taxonomy/term', $url, $link['href']);
       }
     }
@@ -384,11 +384,11 @@
 	if (empty($vid)) {
 		//Check to see if flickr_gallery vocabulary exists
 		$vocab_name = 'flickr_gallery';
-		$sql = "SELECT vid FROM {vocabulary} WHERE module = %s";
+		$sql = "SELECT vid FROM {vocabulary} WHERE module = '%s'";
 		$vid = db_result(db_query($sql,$vocab_name));
 		if (!$vid) {
 			$vocabulary = array (
-				'name' => t('ImageList'),
+				'name' => t('Flickr Gallery'),
 				'multiple' => '1',
 				'required' => '0',
 				'hierarchy' => '1',