From 529cc60ef191a4205b532e16a3485a6917fbd658 Mon Sep 17 00:00:00 2001
From: Florian Weingarten <flo@shopify.com>
Date: Fri, 24 Jul 2015 11:04:40 -0400
Subject: [PATCH] backport argument error fix

---
 lib/liquid/standardfilters.rb            | 2 +-
 test/integration/standard_filter_test.rb | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/liquid/standardfilters.rb b/lib/liquid/standardfilters.rb
index bbbda38..1bf0320 100644
--- a/lib/liquid/standardfilters.rb
+++ b/lib/liquid/standardfilters.rb
@@ -316,7 +316,7 @@ module Liquid
       else
         nil
       end
-    rescue ArgumentError
+    rescue ::ArgumentError
       nil
     end
 
diff --git a/test/integration/standard_filter_test.rb b/test/integration/standard_filter_test.rb
index 0170724..c89adec 100644
--- a/test/integration/standard_filter_test.rb
+++ b/test/integration/standard_filter_test.rb
@@ -379,6 +379,11 @@ class StandardFiltersTest < Minitest::Test
     assert_template_result('a',"{{ 'a' | to_number }}")
   end
 
+  def test_date_raises_nothing
+    assert_template_result('', "{{ '' | date: '%D' }}")
+    assert_template_result('abc', "{{ 'abc' | date: '%D' }}")
+  end
+
   private
 
   def with_timezone(tz)