lib/yandex_captcha/helpers/sinatra.rb in yandex_captcha-0.4.3.4 vs lib/yandex_captcha/helpers/sinatra.rb in yandex_captcha-0.4.3.5

@@ -1,14 +1,17 @@
 module YandexCaptcha
   module Helpers
     module Sinatra
       def captcha_tags(options = {})
+        return if YandexCaptcha.skip_env
+
         template = settings.captcha_ajax_template.to_s.to_sym
         if options[:ajax]
           render(current_engine, template, {layout: false}).to_s.html_safe
         else
+          error = options[:error] ||= ((defined? flash) ? flash[:yandex_captcha_error] : "")
           captcha = YandexCaptcha::Verify.get_captcha
-          render(current_engine, template, {layout: false}, { captcha: captcha, noscript: options[:noscript] }).to_s.html_safe if captcha
+          render(current_engine, template, {layout: false}, { captcha: captcha, error: error, noscript: options[:noscript] }).to_s.html_safe if captcha
         end
       end
 
     end
   end