From fe6e4d7da10b2e0f27640f91c4b7112ef0ca55be Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Fri, 29 Aug 2014 12:01:13 +1000
Subject: [PATCH] FIX: fails on initial migration if default_locale is nil

---
 lib/tasks/db.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index bc5cc8206ea..4c07eb45d04 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -1,6 +1,6 @@
 # we need to run seed_fu every time we run rake db:migrate
 task 'db:migrate' => 'environment' do
-  I18n.locale = SiteSetting.default_locale rescue :en
+  I18n.locale = (SiteSetting.default_locale || :en) rescue :en
   SeedFu.seed
 
   if SiteSetting.vacuum_db_days > 0 &&