typo 5.1.3 → 5.1.98

data/app/helpers/admin/feedback_helper.rb

@@ -1,33 +1,2 @@
 module Admin::FeedbackHelper
-  def link_to_article_edit(article)
-    link_to truncate(article.title, 60), :controller => '/admin/content', :action => 'edit', :id => article.id
-  end
-
-  # Define if all_feedback is the current
-  def all_feedback
-    if params[:confirmed] != 'f' and params[:published] != 'f'
-      return 'current'
-    end
-  end
-
-  # Define if limit to spam is the current
-  def limit_to_spam
-    if params[:published] == 'f' and params[:confirmed] != 'f'
-      return 'current'
-    end
-  end
-
-  # Define if limit to unconfirmed is the current
-  def limit_to_unconfirmed
-    if params[:published] != 'f' and params[:confirmed] == 'f'
-      return 'current'
-    end
-  end
-
-  # Define if limit to unconfirmed spam is the current
-  def limit_to_unconfirmed_spam
-    if params[:published] == 'f' and params[:confirmed] == 'f'
-      return 'current'
-    end
-  end
 end

data/app/helpers/admin/pages_helper.rb

@@ -5,24 +5,4 @@ module Admin::PagesHelper
     [@page]
   end
   
-  def display_page_row(page)
-    result = "<tr alternate_class>\n"
-    result << "<td>#{link_to_permalink(page,page.title)}</td>\n"
-    result << "<td>/pages/#{page.name}</td>\n"
-    result << "<td>#{page.created_at.strftime('%d/%m/%Y at %H:%M')}</td>\n"
-    result << "<td>#{author_link(page)}</td>\n"
-    result << "<td class='operation'>" 
-    if page.published?
-      result << image_tag('admin/checked.png', :alt => "online", :title => _("Online")) 
-    else
-      result << image_tag('admin/cancel.png', :alt => "offline", :title => _("Offline")) 
-    end 
-    result << "</td>\n"
-    result << "<td class='operation'>#{link_to image_tag('admin/show.png', :alt => 'View page', :title => 'Preview page'), {:action => 'show', :id => page.id}}</td>\n"
-    result << "<td class='operation'>#{link_to_edit page}</td>\n"
-    result << "<td class='operation'>#{link_to_destroy page}</td>\n"
-    result << "</tr>\n"
-    return result
-  end
-  
 end

data/app/helpers/admin/settings_helper.rb

@@ -15,4 +15,9 @@ module Admin::SettingsHelper
 	end
 	options
   end
+  
+  def sweep_cache_link
+    cache = this_blog.cache_option == "caches_action_with_params" ? "sweep" : "sweep_html"
+    link_to _("Sweep cache"), { :controller => "admin/cache",    :action => cache }
+  end
 end

data/app/helpers/application_helper.rb

@@ -5,32 +5,32 @@ module ApplicationHelper
   # Basic english pluralizer.
   # Axe?
 
-  def pluralize(size, word)
+  def pluralize(size, zero, one , many )
     case size
-    when 0 then _("no ") +  word.pluralize
-    when 1 then "1 #{word}"
-    else        "#{size} #{word.pluralize}"
+    when 0 then zero
+    when 1 then one
+    else        sprintf(many, size)
     end
   end
 
   # Produce a link to the permalink_url of 'item'.
-  def link_to_permalink(item, title, anchor=nil, style=nil)
+  def link_to_permalink(item, title, anchor=nil, style=nil, nofollow=nil)
     anchor = "##{anchor}" if anchor
     case item
     when Article
-      "<a href=\"#{article_path(item)}#{anchor}\" class=\"#{style}\">#{title}</a>"
+      "<a href=\"#{article_path(item)}#{anchor}\" rel=\"#{nofollow}\" class=\"#{style}\">#{title}</a>"
     else
-      "<a href=\"#{item.permalink_url}#{anchor}\" class=\"#{style}\">#{title}</a>"
+      "<a href=\"#{item.permalink_url}#{anchor}\" rel=\"#{nofollow}\" class=\"#{style}\">#{title}</a>"
     end
   end
 
   # The '5 comments' link from the bottom of articles
   def comments_link(article)
-    link_to_permalink(article,pluralize(article.published_comments.size, _('comment')),'comments')
+    link_to_permalink(article,pluralize(article.published_comments.size, _('no comments') , _('1 comment'), __('%d comments')),'comments')
   end
 
   def trackbacks_link(article)
-    link_to_permalink(article,pluralize(article.published_trackbacks.size, 'trackback'),'trackbacks')
+    link_to_permalink(article,pluralize(article.published_trackbacks.size, _('no trackbacks') , _('1 trackback'), __('%d trackbacks')),'trackbacks')
   end
 
   def check_cache(aggregator, *args)
@@ -63,12 +63,12 @@ module ApplicationHelper
 
   def markup_help_popup(markup, text)
     if markup and markup.commenthelp.size > 1
-      "<a href=\"#{url_for :controller => '/articles', :action => 'markup_help', :id => markup.id}\" onclick=\"return popup(this, 'Typo Markup Help')\">#{text}</a>"
+      "<a href=\"#{url_for :controller => :articles, :action => 'markup_help', :id => markup.id}\" onclick=\"return popup(this, 'Typo Markup Help')\">#{text}</a>"
     else
       ''
     end
   end
-
+  
   # Deprecated helpers
   typo_deprecate :server_url_for => :url_for
 
@@ -110,18 +110,6 @@ module ApplicationHelper
     content.html(what)
   end
 
-  def article_html(article, what = :all)
-    html(article, what, true)
-  end
-
-  def comment_html(comment)
-    html(comment, :body, true)
-  end
-
-  def page_html(page)
-    html(page, :body, true)
-  end
-
   def strip_html(text)
     typo_deprecated "use text.strip_html"
     text.strip_html
@@ -134,7 +122,7 @@ module ApplicationHelper
       link_to_remote('nuke', {
           :url => feedback_path(model.id),
           :method => :delete,
-          :confirm => "Are you sure you want to delete this #{type}?"
+          :confirm => _("Are you sure you want to delete this %s?", "#{type}" )
         }, :class => "admintools") <<
       link_to('edit', {
         :controller => "admin/#{type.pluralize}",
@@ -152,6 +140,16 @@ module ApplicationHelper
     tag
   end
 
+  def render_flash
+    output = []
+
+    for key,value in flash
+      output << "<span class=\"#{key.to_s.downcase}\">#{h(value)}</span>"
+    end if flash
+
+    output.join("<br />\n")
+  end
+  
   # Generate the image tag for a commenters gravatar based on their email address
   # Valid options are described at http://www.gravatar.com/implement.php
   def gravatar_tag(email, options={})
@@ -180,6 +178,21 @@ module ApplicationHelper
     end
   end
 
+  def google_analytics
+    unless this_blog.google_analytics.empty?
+      <<-HTML
+      <script type="text/javascript">
+      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+      </script>
+      <script type="text/javascript">
+      var pageTracker = _gat._getTracker("#{this_blog.google_analytics}");
+      pageTracker._trackPageview();
+      </script>
+      HTML
+    end
+  end
+
   def page_header
     page_header_includes = contents.collect { |c| c.whiteboard }.collect do |w|
       w.select {|k,v| k =~ /^page_header_/}.collect do |(k,v)|
@@ -193,11 +206,13 @@ module ApplicationHelper
     (
     <<-HTML
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-  #{ meta_tag 'ICBM', this_blog.geourl_location unless this_blog.geourl_location.empty? }
+  #{ meta_tag 'ICBM', this_blog.geourl_location unless this_blog.geourl_location.blank? }
+  #{ meta_tag 'description', @description unless @description.blank? }
+  #{ meta_tag 'keywords', @keywords unless @keywords.blank? }
   <link rel="EditURI" type="application/rsd+xml" title="RSD" href="#{ url_for :controller => '/xml', :action => 'rsd' }" />
   <link rel="alternate" type="application/atom+xml" title="Atom" href="#{ @auto_discovery_url_atom }" />
   <link rel="alternate" type="application/rss+xml" title="RSS" href="#{ @auto_discovery_url_rss }" />
-  #{ stylesheet_link_tag 'typo_code.css', :media => 'all' }
+  #{ stylesheet_link_tag 'coderay.css', :media => 'all' }
   #{ stylesheet_link_tag 'user-styles.css', :media => 'all' }
   #{ javascript_include_tag "lang/" + Localization.lang.to_s }
   #{ javascript_include_tag "cookies" }
@@ -205,8 +220,9 @@ module ApplicationHelper
   #{ javascript_include_tag "prototype" }
   #{ javascript_include_tag "effects" }
   #{ javascript_include_tag "typo" }
-#{ page_header_includes.join("\n") }
+  #{ page_header_includes.join("\n") }
   <script type="text/javascript">#{ @content_for_script }</script>
+  #{ google_analytics }
     HTML
     ).chomp
   end

data/app/helpers/authors_helper.rb

@@ -1,5 +1,3 @@
 module AuthorsHelper
-  def title_for_grouping(author)
-    "#{pluralize(author.published_articles.size, 'post')} with author #{author.display_name}"
-  end
+
 end

data/app/helpers/content_helper.rb

@@ -8,7 +8,7 @@ module ContentHelper
   end
 
   def title_for_grouping(grouping)
-    "#{pluralize(grouping.article_counter, 'post')} with #{grouping.class.to_s.underscore} '#{grouping.display_name}'"
+    "#{pluralize(grouping.article_counter, _('no posts') , _('1 post'), __('%d posts'))} with #{grouping.class.to_s.underscore} '#{grouping.display_name}'"
   end
 
   def ul_tag_for(grouping_class)
@@ -34,23 +34,6 @@ module ContentHelper
 
   include SidebarHelper
 
-  def render_errors(obj)
-    return "" unless obj
-    tag = String.new
-
-    unless obj.errors.empty?
-      tag << %{<ul class="objerrors">}
-
-      obj.errors.each_full do |message|
-        tag << "<li>#{message}</li>"
-      end
-
-      tag << "</ul>"
-    end
-
-    tag
-  end
-
   def article_links(article)
     returning code = [] do
       code << category_links(article)   unless article.categories.empty?

data/app/helpers/sidebar_helper.rb

@@ -28,4 +28,16 @@ module SidebarHelper
     end
   end
 
+  def articles?
+    not Article.first.nil?
+  end
+
+  def trackbacks?
+    not Trackback.first.nil?
+  end
+
+  def comments?
+    not Comment.first.nil?
+  end
+
 end

data/app/helpers/theme_helper.rb

@@ -1,23 +1,3 @@
 module ThemeHelper
 
-  # NB: This overrides an undocumented rails function in order to add
-  # a search path. We need this to get themes working, but I'd be
-  # happier if we didn't have to override undocumented methods. Ho
-  # hum. -- pdcawley
-
-#   def search_paths
-#     ["../themes/#{this_blog.theme}/views",     # for components
-#      "../../themes/#{this_blog.theme}/views",  # for normal views
-#      ".",
-#      "../app/views"]
-#   end
-
-#   def full_template_path(template_path, extension)
-#     search_paths.each do |path|
-#       themed_path = File.join(view_paths.first, path, "#{template_path}.#{extension}")
-#       return themed_path if File.exist?(themed_path)
-#     end
-#     # Can't find a themed version, so fall back to the default behaviour
-#     super
-#   end
 end

data/app/helpers/xml_helper.rb

@@ -2,15 +2,7 @@ module XmlHelper
   def pub_date(time)
     time.rfc822
   end
-
-  def post_title(post)
-    h(post.title)
-  end
-
-  def blog_title
-    this_blog.blog_name || "Unnamed blog"
-  end
-
+  
   def collection_lastmod(collection)
     article_updated = collection.articles.find(:first, :order => 'updated_at DESC')
     article_published = collection.articles.find(:first, :order => 'published_at DESC')

data/app/models/article.rb

@@ -8,7 +8,20 @@ class Article < Content
 
   has_many :pings,      :dependent => :destroy, :order => "created_at ASC"
 
-  has_many :comments,   :dependent => :destroy, :order => "created_at ASC"
+  has_many :comments,   :dependent => :destroy, :order => "created_at ASC" do
+
+    # Get only ham or presumed_ham comments
+    def ham
+      find :all, :conditions => {:state => ["presumed_ham", "ham"]}
+    end
+
+    # Get only spam or presumed_spam comments
+    def spam
+      find :all, :conditions => {:state => ["presumed_spam", "spam"]}
+    end
+
+  end
+
   with_options(:conditions => { :published => true }, :order => 'created_at DESC') do |this|
     this.has_many :published_comments,   :class_name => "Comment", :order => "created_at ASC"
     this.has_many :published_trackbacks, :class_name => "Trackback", :order => "created_at ASC"
@@ -17,7 +30,8 @@ class Article < Content
 
   has_many :trackbacks, :dependent => :destroy, :order => "created_at ASC"
 
-  has_many :feedback,                           :order => "created_at DESC"
+  #TODO: change it because more logical with s in end : feedbacks
+  has_many :feedback, :order => "created_at DESC"
 
   has_many :resources, :order => "created_at DESC",
            :class_name => "Resource", :foreign_key => 'article_id'
@@ -26,11 +40,15 @@ class Article < Content
   has_many :categorizations
   has_many :categories, \
     :through => :categorizations, \
+    :include => :categorizations, \
     :uniq => true, \
-    :order => 'categorizations.is_primary DESC, categories.position'
+    :order => 'categorizations.is_primary DESC, categories.position '
 
   has_and_belongs_to_many :tags, :foreign_key => 'article_id'
 
+  named_scope :category, lambda {|category_id| {:conditions => ['categorizations.category_id = ?', category_id], :include => 'categorizations'}}
+
+
   belongs_to :user
 
   has_many :triggers, :as => :pending_item
@@ -59,6 +77,19 @@ class Article < Content
     def count_published_articles
       count(:conditions => { :published => true })
     end
+
+    def search_no_draft_paginate(search_hash, paginate_hash)
+      list_function  = ["Article.no_draft"] + function_search_no_draft(search_hash)
+
+      if search_hash[:category] and search_hash[:category].to_i > 0
+        list_function << 'category(search_hash[:category])'
+      end
+
+      paginate_hash[:order] = 'created_at DESC'
+      list_function << "paginate(paginate_hash)"
+      eval(list_function.join('.'))
+    end
+
   end
 
   accents = { ['á','à','â','ä','ã','Ã','Ä','Â','À'] => 'a',
@@ -246,11 +277,12 @@ class Article < Content
   end
 
   # Fulltext searches the body of published articles
-  def self.search(query)
-    if !query.to_s.strip.empty?
-      tokens = query.split.collect {|c| "%#{c.downcase}%"}
-      find_published(:all,
-                     :conditions => [(["(LOWER(body) LIKE ? OR LOWER(extended) LIKE ? OR LOWER(title) LIKE ?)"] * tokens.size).join(" AND "), *tokens.collect { |token| [token] * 3 }.flatten])
+  def self.search(query, args={})
+    query_s = query.to_s.strip
+    if !query_s.empty? && args.empty?
+      Article.searchstring(query)
+    elsif !query_s.empty? && !args.empty?
+      Article.searchstring(query).paginate(args)
     else
       []
     end
@@ -352,6 +384,25 @@ class Article < Content
     [:body, :extended]
   end
 
+  # The web interface no longer distinguishes between separate "body" and
+  # "extended" fields, and instead edits everything in a single edit field,
+  # separating the extended content using "<!--more-->".
+  def body_and_extended
+    if extended.nil? || extended.empty?
+      body
+    else
+      body + "\n<!--more-->\n" + extended
+    end
+  end
+
+  # Split apart value around a "<!--more-->" comment and assign it to our
+  # #body and #extended fields.
+  def body_and_extended= value
+    parts = value.split(/\n?<!--more-->\n?/, 2)
+    self.body = parts[0]
+    self.extended = parts[1] || ''
+  end
+
   ## Feed Stuff
   def rss_trackback(xml)
     return unless allow_pings?
@@ -414,12 +465,21 @@ class Article < Content
   end
 
   def atom_content(xml)
+    if self.user && self.user.name
+      rss_desc = "<hr /><p><small>#{_('Original article writen by')} #{self.user.name} #{_('and published on')} <a href='#{blog.base_url}'>#{blog.blog_name}</a> | <a href='#{self.permalink_url}'>#{_('direct link to this article')}</a> | #{_('If you are reading this article elsewhere than')} <a href='#{blog.base_url}'>#{blog.blog_name}</a>, #{_('it has been illegally reproduced and without proper authorization')}.</small></p>"
+    else
+      rss_desc = ""
+    end
+
+    post = html(blog.show_extended_on_rss ? :all : :body)
+    content = blog.rss_description ? post + rss_desc : post
+
     xml.summary "type" => "xhtml" do
       xml.div(:xmlns => "http://www.w3.org/1999/xhtml") {xml << html(:body) }
     end
     if blog.show_extended_on_rss
       xml.content(:type => "xhtml") do
-        xml.div(:xmlns => 'http://www.w3.org/1999/xhtml') { xml << html(:all) }
+        xml.div(:xmlns => 'http://www.w3.org/1999/xhtml') { xml << content }
       end
     end
   end
@@ -432,6 +492,10 @@ class Article < Content
     self.categorizations.build(:category => category, :is_primary => is_primary)
   end
 
+  def access_by?(user) 
+    user.admin? || user_id == user.id 
+  end
+
   protected
 
   before_create :set_defaults, :create_guid

data/app/models/blog.rb

@@ -17,6 +17,7 @@ end
 # matches the base_url computed for each request.
 class Blog < CachedModel
   include ConfigManager
+  extend ActiveSupport::Memoizable
 
   validate_on_create { |blog|
     unless Blog.count.zero?
@@ -71,6 +72,12 @@ class Blog < CachedModel
   setting :cache_option,               :string, 'caches_page'
   setting :allow_signup,               :integer, 0
 
+  # SEO
+  setting :meta_description,           :string, ''
+  setting :meta_keywords,              :string, ''
+  setting :google_analytics,           :string, ''
+  setting :rss_description,            :boolean, false
+  
   #deprecation warning for plugins removal
   setting :deprecation_warning,        :integer, 1
 
@@ -94,6 +101,9 @@ class Blog < CachedModel
   # The default Blog.  This is the lowest-numbered blog, almost always id==1.
   def self.default
     find(:first, :order => 'id')
+  rescue
+    logger.warn 'You have not Blog install.'
+    nil
   end
 
   def ping_article!(settings)
@@ -119,8 +129,9 @@ class Blog < CachedModel
 
   # The +Theme+ object for the current theme.
   def current_theme
-    @cached_theme ||= Theme.find(theme)
+    Theme.find(theme)
   end
+  memoize :current_theme
 
   # Generate a URL based on the +base_url+.  This allows us to generate URLs
   # without needing a controller handy, so we can produce URLs from within models
@@ -135,8 +146,18 @@ class Blog < CachedModel
       unless RouteCache[options]
         options.reverse_merge!(:only_path => true, :controller => '',
                                :action => 'permalink')
+        # In Rails > 2.2 the rewrite method use
+        # ActionController::Base.relative_url_root instead of
+        # @request.relative_url_root
+        if ActionController::Base.relative_url_root.nil?
+          old_relative_url = nil
+        else
+          old_relative_url = ActionController::Base.relative_url_root.dup
+        end
+        ActionController::Base.relative_url_root = self.base_url
         @url ||= ActionController::UrlRewriter.new(BlogRequest.new(self.base_url), {})
         RouteCache[options] = @url.rewrite(options)
+        ActionController::Base.relative_url_root = old_relative_url
       end
 
       return RouteCache[options]
@@ -191,8 +212,8 @@ class Blog < CachedModel
     Article.find_all_by_date(*params.values_at(:year, :month, :day))
   end
 
-  def articles_matching(query)
-    Article.search(query)
+  def articles_matching(query, args={})
+    Article.search(query, args)
   end
 
   def rss_limit_params

data/app/models/blog_sweeper.rb

@@ -1,5 +1,5 @@
 class BlogSweeper < ActionController::Caching::Sweeper
-  observe Category, Blog, Sidebar, User, Article, Page, Categorization
+  observe Category, Blog, User, Article, Page, Categorization, Comment, Trackback
 
   def pending_sweeps
     @pending_sweeps ||= Set.new
@@ -48,9 +48,9 @@ class BlogSweeper < ActionController::Caching::Sweeper
       if record.invalidates_cache?(destroying)
         pending_sweeps << :sweep_articles << :sweep_pages
       end
-    when Sidebar, Category, Categorization
+    when Category, Categorization
       pending_sweeps << :sweep_articles << :sweep_pages
-    when Blog, User
+    when Blog, User, Comment, Trackback
       pending_sweeps << :sweep_all << :sweep_theme
     end
     unless controller
@@ -69,16 +69,7 @@ class BlogSweeper < ActionController::Caching::Sweeper
 
   def sweep_articles
     expire_fragment(%r{.*/articles/.*})
-    unless Blog.default && Blog.default.cache_option == "caches_action_with_params"
-      PageCache.zap_pages(%w{index.* articles.* page
-                     pages.* feedback feedback.*
-                     comments comments.*
-                     category categories.* xml
-                     tag tags.* category archive.* *.rss *.atom  })
-
-      PageCache.zap_pages((1990..2020))
-      PageCache.zap_pages([*1990..2020].collect { |y| "#{y}.*" })
-    end
+    PageCache.sweep_all
   end
 
   def sweep_pages

data/app/models/category.rb

@@ -1,5 +1,6 @@
 class Category < ActiveRecord::Base
   acts_as_list
+  acts_as_tree :order=>"name"
   has_many :categorizations
 
   has_many :articles,

data/app/models/content.rb

@@ -1,9 +1,6 @@
-require 'observer'
 require 'set'
 
 class Content < ActiveRecord::Base
-  include Observable
-
   belongs_to :text_filter
 
   has_many :notifications, :foreign_key => 'content_id'
@@ -24,6 +21,18 @@ class Content < ActiveRecord::Base
 
   has_many :triggers, :as => :pending_item, :dependent => :delete_all
 
+  named_scope :published_at_like, lambda {|date_at| {:conditions => ['published_at LIKE ? ', "%#{date_at}%"]}}
+  named_scope :user_id, lambda {|user_id| {:conditions => ['user_id = ?', user_id]}}
+  named_scope :published, {:conditions => ['published = ?', true]}
+  named_scope :not_published, {:conditions => ['published = ?', false]}
+  named_scope :draft, {:conditions => ['state = ?', 'draft']}
+  named_scope :no_draft, {:conditions => ['state <> ?', 'draft'], :order => 'created_at DESC'}
+  named_scope :searchstring, lambda {|search_string|
+    tokens = search_string.split.collect {|c| "%#{c.downcase}%"}
+    {:conditions => [(['(LOWER(body) LIKE ? OR LOWER(extended) LIKE ? OR LOWER(title) LIKE ?)']*tokens.size).join(' AND '),
+                      *tokens.collect{ |token| [token] * 3 }.flatten]}
+  }
+
   serialize :whiteboard
 
   attr_accessor :just_changed_published_status
@@ -135,6 +144,31 @@ class Content < ActiveRecord::Base
         dates
       end
     end
+
+    def function_search_no_draft(search_hash)
+      list_function = []
+      if search_hash.nil?
+        search_hash = {}
+      end
+
+      if search_hash[:searchstring]
+        list_function << 'searchstring(search_hash[:searchstring])'
+      end
+
+      if search_hash[:published_at] and %r{(\d\d\d\d)-(\d\d)} =~ search_hash[:published_at]
+        list_function << 'published_at_like(search_hash[:published_at])'
+      end
+
+      if search_hash[:user_id] && search_hash[:user_id].to_i > 0
+        list_function << 'user_id(search_hash[:user_id])'
+      end
+
+      if search_hash[:published]
+        list_function << 'published' if search_hash[:published].to_s == '1'
+        list_function << 'not_published' if search_hash[:published].to_s == '0'
+      end
+      list_function
+    end
   end
 
   def content_fields
@@ -275,7 +309,13 @@ class Content < ActiveRecord::Base
   end
 
   def rss_description(xml)
-    xml.description(html(blog.show_extended_on_rss ? :all : :body))
+    if self.user && self.user.name
+      rss_desc = "<hr /><p><small>#{_('Original article writen by')} #{self.user.name} #{_('and published on')} <a href='#{blog.base_url}'>#{blog.blog_name}</a> | <a href='#{self.permalink_url}'>#{_('direct link to this article')}</a> | #{_('If you are reading this article elsewhere than')} <a href='#{blog.base_url}'>#{blog.blog_name}</a>, #{_('it has been illegally reproduced and without proper authorization')}.</small></p>"
+    else
+      rss_desc = ""
+    end
+    post = html(blog.show_extended_on_rss ? :all : :body)
+    xml.description(blog.rss_description ? post + rss_desc : post)
   end
 
   def rss_groupings(xml)
@@ -317,5 +357,6 @@ class ContentTextHelpers
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::SanitizeHelper
   include ActionView::Helpers::TextHelper
+  extend ActionView::Helpers::SanitizeHelper::ClassMethods
 end