profile-helper: avoid method name conflict

Rodrigo Souto
1 parent 3f355c74
Showing 1 changed file with 5 additions and 5 deletions Show diff stats
app/helpers/profile_helper.rb
@@ -62,7 +62,7 @@ module ProfileHelper
   end
  
   def title(field, entry = nil)
-    return self.send("#{field}_title", entry) if MULTIPLE[kind].include?(field) && entry.present?
+    return self.send("#{field}_custom_title", entry) if MULTIPLE[kind].include?(field) && entry.present?
     CUSTOM_LABELS[field.to_sym] || field.to_s.humanize
   end
  
@@ -154,13 +154,13 @@ module ProfileHelper
     link_to interest.name, :controller => 'search', :action => 'category_index', :category_path => interest.explode_path
   end
  
-  def article_title(article)
+  def article_custom_title(article)
     article.name
   end
-  alias :blogs_title :article_title
-  alias :image_galleries_title :article_title
+  alias :blogs_custom_title :article_custom_title
+  alias :image_galleries_custom_title :article_custom_title
  
-  def interests_title(interest)
+  def interests_custom_title(interest)
     ''
   end
...	...	@@ -62,7 +62,7 @@ module ProfileHelper
62	62	end
63	63
64	64	def title(field, entry = nil)
65		- return self.send("#{field}_title", entry) if MULTIPLE[kind].include?(field) && entry.present?
	65	+ return self.send("#{field}_custom_title", entry) if MULTIPLE[kind].include?(field) && entry.present?
66	66	CUSTOM_LABELS[field.to_sym] \|\| field.to_s.humanize
67	67	end
68	68
...	...	@@ -154,13 +154,13 @@ module ProfileHelper
154	154	link_to interest.name, :controller => 'search', :action => 'category_index', :category_path => interest.explode_path
155	155	end
156	156
157		- def article_title(article)
	157	+ def article_custom_title(article)
158	158	article.name
159	159	end
160		- alias :blogs_title :article_title
161		- alias :image_galleries_title :article_title
	160	+ alias :blogs_custom_title :article_custom_title
	161	+ alias :image_galleries_custom_title :article_custom_title
162	162
163		- def interests_title(interest)
	163	+ def interests_custom_title(interest)
164	164	''
165	165	end
166	166
...	...