From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 29 May 2007 22:20:43 +0000 (+0000)
Subject: Fixed: error on csv/pdf export and feeds (oracle)
X-Git-Tag: 0.5.1~37
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7fb03b1ca30a49dcfbd0b4d3c0ce250ba8cc6002;p=redmine.git

Fixed: error on csv/pdf export and feeds (oracle)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@556 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
index 214f80c95..bf03acbc9 100644
--- a/app/controllers/feeds_controller.rb
+++ b/app/controllers/feeds_controller.rb
@@ -92,7 +92,7 @@ private
       # global feed
       scope = ["#{Project.table_name}.is_public=?", true]
     end
-    @find_options = {:conditions => scope, :limit => Setting.feeds_limit}
+    @find_options = {:conditions => scope, :limit => Setting.feeds_limit.to_i}
     return true
   end
 end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1de3788ac..0dc6cba26 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -297,7 +297,7 @@ class ProjectsController < ApplicationController
     @issues =  Issue.find :all, :order => sort_clause,
 						:include => [ :assigned_to, :author, :status, :tracker, :priority, :project, {:custom_values => :custom_field} ],
 						:conditions => @query.statement,
-						:limit => Setting.issues_export_limit
+						:limit => Setting.issues_export_limit.to_i
 
     ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')    
     export = StringIO.new
@@ -356,7 +356,7 @@ class ProjectsController < ApplicationController
     @issues =  Issue.find :all, :order => sort_clause,
 						:include => [ :author, :status, :tracker, :priority, :project, :custom_values ],
 						:conditions => @query.statement,
-						:limit => Setting.issues_export_limit
+						:limit => Setting.issues_export_limit.to_i
 											
     @options_for_rfpdf ||= {}
     @options_for_rfpdf[:file_name] = "export.pdf"