From 14e445c600b5efefa2e7333d0a5cf85bdabf2653 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Thu, 12 Feb 2009 01:32:50 +0000
Subject: [PATCH] Fixed the bundled ruby-openid gem

* The open_id_authentication plugin will require the gem automatically so
  it doesn't need to be added to environment.rb
* Changed the version requirement on the open_id_authentication to match
  the latest stable version.  Rails config.gem looks for a directory named
  after that specific version and will not load newer versions.

  #699

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2452 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/environment.rb                         | 2 --
 vendor/plugins/open_id_authentication/init.rb | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/config/environment.rb b/config/environment.rb
index 70d0c55a..fdac6b4f 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -54,6 +54,4 @@ Rails::Initializer.run do |config|
   # Define your email configuration in email.yml instead.
   # It will automatically turn deliveries on
   config.action_mailer.perform_deliveries = false
-  
-  config.gem 'ruby-openid', :lib => 'openid'
 end
diff --git a/vendor/plugins/open_id_authentication/init.rb b/vendor/plugins/open_id_authentication/init.rb
index 808c7bdb..5f94e8c6 100644
--- a/vendor/plugins/open_id_authentication/init.rb
+++ b/vendor/plugins/open_id_authentication/init.rb
@@ -1,11 +1,11 @@
 if config.respond_to?(:gems)
-  config.gem 'ruby-openid', :lib => 'openid', :version => '>=2.0.4'
+  config.gem 'ruby-openid', :lib => 'openid', :version => '>=2.1.4'
 else
   begin
     require 'openid'
   rescue LoadError
     begin
-      gem 'ruby-openid', '>=2.0.4'
+      gem 'ruby-openid', '>=2.1.4'
     rescue Gem::LoadError
       puts "Install the ruby-openid gem to enable OpenID support"
     end