summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2009-08-01 18:28:57 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2009-08-01 18:28:57 +0000
commit3d68b600636ecdefbccec9047ab9636e8a8a6445 (patch)
tree903bf95ec410e78d1a16a5e42d829bfe491c2db2
parent27b110a61b69517b06573479c7bf0c91f567409b (diff)
downloadredmine-3d68b600636ecdefbccec9047ab9636e8a8a6445.tar.gz
redmine-3d68b600636ecdefbccec9047ab9636e8a8a6445.zip
Fixed a merge error in r2830, wrong hook variables where used.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2831 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/users/_memberships.rhtml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/users/_memberships.rhtml b/app/views/users/_memberships.rhtml
index 86b3a218c..584929111 100644
--- a/app/views/users/_memberships.rhtml
+++ b/app/views/users/_memberships.rhtml
@@ -20,7 +20,7 @@
<td align="center">
<%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :method => :post, :class => 'icon icon-del' %>
</td>
- <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%>
+ <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => @roles, :projects => @projects )%>
</tr>
</tbody>
<% end; reset_cycle %>