make sure a content type is specified before using categories

cykod · Jan 24, 2011 · 3d0da3b · 3d0da3b
1 parent 9064784
commit 3d0da3b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/models/content_node_search.rb b/app/models/content_node_search.rb
@@ -79,7 +79,7 @@ def frontend_search
     conditions = {:search_result => 1}
     conditions[:content_type_id] = self.content_type_id if self.content_type_id
     conditions[:protected_result] = 0 if self.protected_results.blank?
-    conditions[:content_node_id] = self.category_content_node_ids if self.category_id
+    conditions[:content_node_id] = self.category_content_node_ids if self.category_id && self.content_type_id
 
     offset = (self.page - 1) * self.per_page