From 9e607bc7a343e609b5d321601d22d9e63828b8c3 Mon Sep 17 00:00:00 2001 From: slainer68 Date: Mon, 13 Sep 2010 17:08:07 +0200 Subject: [PATCH] Do not require Devise or RPXNow if already defined. --- lib/devise_rpx_connectable.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/devise_rpx_connectable.rb b/lib/devise_rpx_connectable.rb index a70fe01..09b9d13 100755 --- a/lib/devise_rpx_connectable.rb +++ b/lib/devise_rpx_connectable.rb @@ -1,6 +1,10 @@ # encoding: utf-8 -require 'devise' -require 'rpx_now' +unless defined?(Devise) + require 'devise' +end +unless defined?(RPXNow) + require 'rpx_now' +end require 'devise_rpx_connectable/model' require 'devise_rpx_connectable/strategy'