Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRaphael Sofaer <raphael@joindiaspora.com>2011-07-08 02:10:04 +0400
committerRaphael Sofaer <raphael@joindiaspora.com>2011-07-08 02:10:04 +0400
commitd0ce2571076bfdee3a414c39dacbdc173e872724 (patch)
tree46f310e33649906399cf04a5859e666dc6b0f725 /lib
parentd2e26f6937c435e682029d2de1d25419e2000f1e (diff)
Revert "Revert "Merge branch 'hashtags-in-comments'""
This reverts commit d2e26f6937c435e682029d2de1d25419e2000f1e.
Diffstat (limited to 'lib')
-rw-r--r--lib/diaspora/taggable.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diaspora/taggable.rb b/lib/diaspora/taggable.rb
index 2eff35442..7c3ab66bd 100644
--- a/lib/diaspora/taggable.rb
+++ b/lib/diaspora/taggable.rb
@@ -36,7 +36,7 @@ module Diaspora
unique_matches.values
end
- def format_tags(text, opts={})
+ def self.format_tags(text, opts={})
return text if opts[:plain_text]
regex = /(^|\s)#(#{VALID_TAG_BODY})/
form_message = text.gsub(regex) do |matched_string|