Commit 401a2773d7732352a5dedae45fc5033be55714dd
1 parent
3f355c74
Exists in
master
and in
29 other branches
profile-helper: avoid method name conflict
Showing
1 changed file
with
5 additions
and
5 deletions
Show diff stats
app/helpers/profile_helper.rb
@@ -62,7 +62,7 @@ module ProfileHelper | @@ -62,7 +62,7 @@ module ProfileHelper | ||
62 | end | 62 | end |
63 | 63 | ||
64 | def title(field, entry = nil) | 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 | CUSTOM_LABELS[field.to_sym] || field.to_s.humanize | 66 | CUSTOM_LABELS[field.to_sym] || field.to_s.humanize |
67 | end | 67 | end |
68 | 68 | ||
@@ -154,13 +154,13 @@ module ProfileHelper | @@ -154,13 +154,13 @@ module ProfileHelper | ||
154 | link_to interest.name, :controller => 'search', :action => 'category_index', :category_path => interest.explode_path | 154 | link_to interest.name, :controller => 'search', :action => 'category_index', :category_path => interest.explode_path |
155 | end | 155 | end |
156 | 156 | ||
157 | - def article_title(article) | 157 | + def article_custom_title(article) |
158 | article.name | 158 | article.name |
159 | end | 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 | end | 165 | end |
166 | 166 |