Merge branch 'master' of github.com:blindsidenetworks/greenlight

2016-10-18 10:03:50 -04:00
parent f725b7f1bc 352abe78af
commit e9caa740aa
17 changed files with 148 additions and 17 deletions
--- a/app/helpers/bbb_helper.rb
+++ b/app/helpers/bbb_helper.rb
@ -4,7 +4,7 @@ module BbbHelper
    if !bbb
      return { :returncode => false, :messageKey => "BBBAPICallInvalid", :message => "BBB API call invalid." }
    else
-      meeting_id = (Digest::SHA1.hexdigest("Rails.application.secrets.secret_key_base"+meeting_token)).to_s
+      meeting_id = (Digest::SHA1.hexdigest(Rails.application.secrets[:secret_key_base]+meeting_token)).to_s

      #See if the meeting is running
      begin