aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/general_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-12-09 12:21:39 +0000
committerLouise Crow <louise.crow@gmail.com>2013-12-09 12:21:39 +0000
commit9116d60f53bf2eb0bcf935916e660fac38be212a (patch)
tree3ebbdd3d4bd6a4db85ad6d6e643fb408fbd6a72d /app/controllers/general_controller.rb
parentf2a0c9485dd2655c11e9717583c7d3c7b3a49d7a (diff)
parent31187a4d13a7f914ee5fe4eae0af0a268bce90f9 (diff)
Merge branch 'feature/display-social-media-when-configured' into rails-3-develop
Diffstat (limited to 'app/controllers/general_controller.rb')
-rw-r--r--app/controllers/general_controller.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index aac078829..b01a67027 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -17,6 +17,10 @@ class GeneralController < ApplicationController
# Display blog entries
def blog
+ if AlaveteliConfiguration::blog_feed.empty?
+ raise ActiveRecord::RecordNotFound.new("Page not enabled")
+ end
+
medium_cache
@feed_autodetect = []
@feed_url = AlaveteliConfiguration::blog_feed