From 607ab66707744c3ec09fe1a03d89bd30337ebf57 Mon Sep 17 00:00:00 2001
From: Pat Hawks <pat@pathawks.com>
Date: Thu, 22 Dec 2016 15:13:27 -0600
Subject: [PATCH] Use Liquid's own `to_integer`

---
 lib/jekyll/filters.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index ca47e06a..1d21b99e 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -280,10 +280,11 @@ module Jekyll
       end
     end
 
-    def pop(array, input = 1)
+    def pop(array, num = 1)
       return array unless array.is_a?(Array)
+      num = Liquid::Utils.to_integer(num)
       new_ary = array.dup
-      new_ary.pop(input.to_i || 1)
+      new_ary.pop(num)
       new_ary
     end
 
@@ -294,10 +295,11 @@ module Jekyll
       new_ary
     end
 
-    def shift(array, input = 1)
+    def shift(array, num = 1)
       return array unless array.is_a?(Array)
+      num = Liquid::Utils.to_integer(num)
       new_ary = array.dup
-      new_ary.shift(input.to_i || 1)
+      new_ary.shift(num)
       new_ary
     end
 
@@ -310,11 +312,11 @@ module Jekyll
 
     def sample(input, num = 1)
       return input unless input.respond_to?(:sample)
-      n = num.to_i rescue 1
-      if n == 1
+      num = Liquid::Utils.to_integer(num)
+      if num == 1
         input.sample
       else
-        input.sample(n)
+        input.sample(num)
       end
     end