Merged r2722, r2771, r2772 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2883 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/account/show.rhtml

@@ -29,6 +29,7 @@
 <% end %>
 </ul>
 <% end %>
+<%= call_hook :view_account_left_bottom, :user => @user %>
 </div>
 
 <div class="splitcontentright">
@@ -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 %>
 </div>
 
 <% html_title @user.name %>

app/views/versions/show.rhtml

@@ -1,5 +1,6 @@
 <div class="contextual">
 <%= 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 }) %>
 </div>
 
 <h2><%= h(@version.name) %></h2>

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

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