lib/picky/internals/indexed/categories.rb in picky-2.4.3 vs lib/picky/internals/indexed/categories.rb in picky-2.5.0

@@ -44,16 +44,11 @@
 
       # Add the given category to the list of categories.
       #
       def << category
         categories << category
-        # Note: [category] is an optimization, since I need an array
-        #       of categories.
-        #       It's faster to just package it in an array on loading
-        #       Picky than doing it over and over with each query.
-        #
-        category_hash[category.name] = [category]
+        category_hash[category.name] = category
       end
 
       # Return all possible combinations for the given token.
       #
       # This checks if it needs to also search through similar
@@ -127,13 +122,16 @@
       end
       # This returns the array of categories if the user has defined
       # an existing category.
       #
       # Note: Returns nil if the user did not define one
-      #       or if he/she has defined a non-existing one.
+      #       or [] if he/she has defined a non-existing one.
       #
       def user_defined_categories token
-        category_hash[token.user_defined_category_name]
+        names = token.user_defined_category_names
+        names && names.map do |name|
+          category_hash[name]
+        end.compact
       end
 
     end
 
   end
\ No newline at end of file