Merge branch 'hotfixes' into stable

Victor Costa
2 parents fa2ae950 b7be7d72
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
app/models/profile.rb
@@ -135,7 +135,7 @@ class Profile &lt; ActiveRecord::Base
   end
   def members_by_name
-    members.order(:name)
+    members.order('profiles.name')
   end
   class << self
	@@ -135,7 +135,7 @@ class Profile < ActiveRecord::Base		@@ -135,7 +135,7 @@ class Profile < ActiveRecord::Base
135	end	135	end
136		136
137	def members_by_name	137	def members_by_name
138	- members.order(:name)	138	+ members.order('profiles.name')
139	end	139	end
140		140
141	class << self	141	class << self