0
@@ -1,6 +1,7 @@
0
 class ApplicationController < ActionController::Base
0
+  require_dependency 'application/errors'
0
+
0
   include Mephisto::CachingMethods
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
@@ -64,17 +65,9 @@ class ApplicationController < ActionController::Base
0
       render :text => site.call_render(@section, template_type, assigns, self), :status => status
0
     end
0
 
0
-    def show_error(message = 'An error occurred.', status = :internal_server_error)
0
-      render_liquid_template_for(:error, 'message' => message, :status => status)
0
-    end
0
-
0
-    def show_404
0
-      show_error 'Page Not Found', :not_found
0
-    end
0
-
0
     def set_cache_root
0
       host = request.domain(request.subdomains.size + (request.subdomains.first == 'www' ? 0 : 1))
0
-      @site ||= Site.find_by_host(host) || Site.find(:first, :order => 'id')
0
+      @site ||= Site.find_by_host(host) || Site.find(:first, :order => 'id') || raise(ActiveRecord::RecordNotFound, "You need to create your first site!")
0
       self.class.page_cache_directory = site.page_cache_directory.to_s
0
     end
0
 
0
@@ -84,15 +77,5 @@ class ApplicationController < ActionController::Base
0
       yield
0
       ENV['TZ'] = old_tz
0
     end
0
-    
0
-    def rescue_action_in_public(exception)
0
-      logger.debug "#{exception.class.name}: #{exception.to_s}"
0
-      exception.backtrace.each { |t| logger.debug " > #{t}" }
0
-      case exception
0
-        when ActiveRecord::RecordNotFound, ::ActionController::UnknownController, ::ActionController::UnknownAction
0
-          render :file => File.join(RAILS_ROOT, 'public/404.html'), :status => :not_found
0
-        else
0
-          render :file => File.join(RAILS_ROOT, 'public/500.html'), :status => :internal_server_error
0
-      end
0
-    end
0
+
0
 end