From debac5dd0bb677d2ce1f51d8c5d9f0c862854db4 Mon Sep 17 00:00:00 2001
From: Florian Weingarten <flo@shopify.com>
Date: Sat, 6 Sep 2014 10:15:25 -0400
Subject: [PATCH] Revert "move line number check"

This reverts commit 939365c234e00152a2cbc8c4b5d711638bfba13a.

Conflicts:
	lib/liquid/template.rb
---
 lib/liquid/template.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/liquid/template.rb b/lib/liquid/template.rb
index 4b5052c..5755722 100644
--- a/lib/liquid/template.rb
+++ b/lib/liquid/template.rb
@@ -105,7 +105,7 @@ module Liquid
     def parse(source, options = {})
       @options = options
       @profiling = options[:profile]
-      @line_numbers = options.delete(:line_numbers)
+      @line_numbers = options[:line_numbers] || @profiling
       @root = Document.parse(tokenize(source), DEFAULT_OPTIONS.merge(options))
       @warnings = nil
       self
@@ -225,7 +225,7 @@ module Liquid
     end
 
     def calculate_line_numbers(raw_tokens)
-      return raw_tokens unless @line_numbers || @profiling
+      return raw_tokens unless @line_numbers
 
       current_line = 1
       raw_tokens.map do |token|