diff --git a/app/views/account/show.rhtml b/app/views/account/show.rhtml index 1ddabba..134c587 100644 --- a/app/views/account/show.rhtml +++ b/app/views/account/show.rhtml @@ -29,6 +29,7 @@ <% end %> <% end %> +<%= call_hook :view_account_left_bottom, :user => @user %>
@@ -64,6 +65,7 @@ <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key) %> <% end %> <% end %> +<%= call_hook :view_account_right_bottom, :user => @user %>
<% html_title @user.name %> diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml index 7e52645..914bbcc 100644 --- a/app/views/versions/show.rhtml +++ b/app/views/versions/show.rhtml @@ -1,5 +1,6 @@
<%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %> +<%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>

<%= h(@version.name) %>

diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 5bdda5b..320b259 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -10,6 +10,8 @@ http://www.redmine.org/ * Incoming mail handler : Allow spaces between keywords and colon * Do not require a non-word character after a comma in Redmine links * Include issue hyperlinks in reminder emails +* Prevent nil error when retrieving svn version +* Various plugin hooks added * Fixed: 500 Internal Server Error is raised if add an empty comment to the news * Fixed: Atom links for wiki pages are not correct * Fixed: Atom feeds leak email address diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb index 0a96ed6..1c85e84 100644 --- a/lib/redmine/scm/adapters/subversion_adapter.rb +++ b/lib/redmine/scm/adapters/subversion_adapter.rb @@ -37,7 +37,7 @@ module Redmine version = nil shellout(cmd) do |io| # Read svn version in first returned line - if m = io.gets.match(%r{((\d+\.)+\d+)}) + if m = io.gets.to_s.match(%r{((\d+\.)+\d+)}) version = m[0].scan(%r{\d+}).collect(&:to_i) end end