From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 23 Nov 2011 19:02:50 +0000 (+0000)
Subject: Prevent clash with Rails 3 Query module.
X-Git-Tag: 1.3.0~113
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3adc1c319243062c471d112c060c092acc321d92;p=redmine.git

Prevent clash with Rails 3 Query module.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7899 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/query.rb b/app/models/query.rb
index a02cc810f..55ac3d6a4 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -352,7 +352,7 @@ class Query < ActiveRecord::Base
 
   def available_columns
     return @available_columns if @available_columns
-    @available_columns = Query.available_columns
+    @available_columns = ::Query.available_columns
     @available_columns += (project ?
                             project.all_issue_custom_fields :
                             IssueCustomField.find(:all)