lib/locomotive/liquid/drops/content_entry.rb in locomotive_cms-2.0.0.rc2 vs lib/locomotive/liquid/drops/content_entry.rb in locomotive_cms-2.0.0.rc4

@@ -43,11 +43,11 @@
           return '' if self._source.nil?
 
           if not @@forbidden_attributes.include?(meth.to_s)
             value = self._source.send(meth)
 
-            if value.respond_to?(:all)
+            if value.respond_to?(:all) # check for an association
               filter_and_order_list(value)
             else
               value
             end
           else
@@ -68,10 +68,10 @@
             else
               list.where(conditions).order_by(order_by)
             end
           else
             list.ordered
-          end.all
+          end
         end
 
       end
     end
   end