Replaced all references to Attachment to either ::Attachment or self

Author: Tim Glen

app/controllers/cms/attachments_controller.rb

@@ -1,6 +1,6 @@
 class Cms::AttachmentsController < Cms::BaseController
  def show
- @attachment = Attachment.find(params[:id])
+ @attachment = ::Attachment.find(params[:id])
  @attachment = @attachment.as_of_version(params[:version]) if params[:version]
  send_file(@attachment.full_file_location, 
  :filename => @attachment.file_name,

app/controllers/cms/content_controller.rb

@@ -102,7 +102,7 @@ def try_to_stream_file
  unless ext.blank?
 
  #Check access to file
- @attachment = Attachment.find_live_by_file_path(@path)
+ @attachment = ::Attachment.find_live_by_file_path(@path)
  if @attachment
  raise Cms::Errors::AccessDenied unless current_user.able_to_view?(@attachment)
 

app/models/attachment.rb

@@ -144,7 +144,7 @@ def self.storage_location=(storage_location)
  end 
 
  def self.find_live_by_file_path(file_path)
- Attachment.published.not_archived.first(:conditions => {:file_path => file_path})
+ self.published.not_archived.first(:conditions => {:file_path => file_path})
  end 
 
  #----- Instance Methods ------------------------------------------------------
@@ -180,7 +180,7 @@ def public?
  end
 
  def full_file_location
- File.join(Attachment.storage_location, file_location)
+ File.join(self.class.storage_location, file_location)
  end
 
  # Forces this record to be changed, even if nothing has changed

lib/cms/behaviors/attaching.rb

@@ -159,7 +159,7 @@ def file_size
 
  def after_as_of_version
  if attachment_id && attachment_version
- self.attachment = Attachment.find(attachment_id).as_of_version(attachment_version)
+ self.attachment = ::Attachment.find(attachment_id).as_of_version(attachment_version)
  end
  end