0
@@ -1,8 +1,15 @@
0
 class CommentObserver < ArticleObserver
0
-  cattr_accessor :disabled
0
+  def self.disabled?
0
+    Thread.current[:comment_observer_disabled]
0
+  end
0
+  
0
+  def disabled=(value)
0
+    Thread.current[:comment_observer_disabled] = value
0
+  end
0
+  
0
   def after_save(record)
0
     @event.update_attributes :title => record.article.title, :body => record.body, :site => record.article.site,
0
-      :article => record.article, :author => record.author, :comment => record if record.approved? && !disabled
0
+      :article => record.article, :author => record.author, :comment => record if record.approved? && !self.class.disabled?
0
   end
0
 
0
   def after_destroy(record)

0
@@ -1,6 +1,6 @@
0
 class ApplicationController < ActionController::Base
0
   include Mephisto::CachingMethods
0
-  cattr_accessor :site_count
0
+  cattr_accessor :site_count # what is this for?  PDI removing
0
   before_filter  :set_cache_root
0
   helper_method  :site
0
   attr_reader    :site

0
@@ -1,10 +1,16 @@
0
 module Mephisto
0
   module Liquid
0
     class CommentForm < ::Liquid::Block
0
-      cattr_accessor :article
0
+      def self.article
0
+        Thread.current[:comment_form_article]
0
+      end
0
+      
0
+      def self.article=(value)
0
+        Thread.current[:comment_form_article] = value
0
+      end
0
     
0
       def render(context)
0
-        return '' unless article.accept_comments?
0
+        return '' unless self.class.article.accept_comments?
0
         result = []
0
         context.stack do
0
           if context['message'].blank?