Merged r7985 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7997 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-29 21:11:54 +00:00
parent 3e4d1fb04f
commit 5d1388db02
2 changed files with 9 additions and 1 deletions
@@ -23,7 +23,7 @@ module Redmine
    
    class << self
      def encrypt_text(text)
-        if cipher_key.blank?
+        if cipher_key.blank? || text.blank?
          text
        else
          c = OpenSSL::Cipher::Cipher.new("aes-256-cbc")