From f4bda8f1bac159dec4e76c070fac5483ee7700a0 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 26 Aug 2013 17:36:08 +1000 Subject: [PATCH] revert change of defaults for twitter and facebook enabled --- app/models/site_setting.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index e9a7af014..53004c947 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -154,11 +154,14 @@ class SiteSetting < ActiveRecord::Base client_setting(:enable_google_logins, true) client_setting(:enable_yahoo_logins, true) - client_setting(:enable_twitter_logins, false) + client_setting(:enable_twitter_logins, true) setting(:twitter_consumer_key, '') setting(:twitter_consumer_secret, '') - client_setting(:enable_facebook_logins, false) + # note we set this (and twitter to true for 2 reasons) + # 1. its an upgrade nightmare to change it to false, lots of people will complain + # 2. it advertises the feature (even though it is broken) + client_setting(:enable_facebook_logins, true) setting(:facebook_app_id, '') setting(:facebook_app_secret, '')