Merge branch 'develop'

taqueci · Dec 21, 2019 · 21f4e92 · 21f4e92
2 parents 7cd9adb + 62f4513
commit 21f4e92
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/init.rb b/init.rb
@@ -22,7 +22,7 @@
   name 'Redmine Local Avatars plugin'
   author 'Andrew Chaika and Luca Pireddu'
   description 'This plugin lets users upload avatars directly into Redmine'
-  version '1.0.5.1.0'
+  version '1.0.5.2.0'
 end
 
 receiver = Object.const_defined?('ActiveSupport::Reloader') ?  ActiveSupport::Reloader : ActionDispatch::Callbacks
@@ -31,8 +31,11 @@
 	require_dependency 'principal'
 	require_dependency 'user'
 
+	avatars_helper = ApplicationHelper.method_defined?(:avatar) ?
+	                   ApplicationHelper : AvatarsHelper
+
 	AccountController.send(:include,  LocalAvatarsPlugin::AccountControllerPatch)
-	ApplicationHelper.send(:include,  LocalAvatarsPlugin::ApplicationAvatarPatch)
+	avatars_helper.send(:include,  LocalAvatarsPlugin::ApplicationAvatarPatch)
 	MyController.send(:include,  LocalAvatarsPlugin::MyControllerPatch)
 	User.send(:include,  LocalAvatarsPlugin::UsersAvatarPatch)
 	UsersController.send(:include,  LocalAvatarsPlugin::UsersControllerPatch)