Load RMagick before the gantt helper (#12097).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10915 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
5b21efd4a4
commit
bd10a71217
|
@ -17,6 +17,12 @@
|
||||||
|
|
||||||
require 'redmine/core_ext'
|
require 'redmine/core_ext'
|
||||||
|
|
||||||
|
begin
|
||||||
|
require 'RMagick' unless Object.const_defined?(:Magick)
|
||||||
|
rescue LoadError
|
||||||
|
# RMagick is not available
|
||||||
|
end
|
||||||
|
|
||||||
require 'redmine/about'
|
require 'redmine/about'
|
||||||
require 'redmine/access_control'
|
require 'redmine/access_control'
|
||||||
require 'redmine/access_keys'
|
require 'redmine/access_keys'
|
||||||
|
@ -53,12 +59,6 @@ require 'redmine/themes'
|
||||||
require 'redmine/hook'
|
require 'redmine/hook'
|
||||||
require 'redmine/plugin'
|
require 'redmine/plugin'
|
||||||
|
|
||||||
begin
|
|
||||||
require 'RMagick' unless Object.const_defined?(:Magick)
|
|
||||||
rescue LoadError
|
|
||||||
# RMagick is not available
|
|
||||||
end
|
|
||||||
|
|
||||||
if RUBY_VERSION < '1.9'
|
if RUBY_VERSION < '1.9'
|
||||||
require 'fastercsv'
|
require 'fastercsv'
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue