1 files changed, 18 insertions, 20 deletions

diff --git a/extensions/Voting/Extension.pm b/extensions/Voting/Extension.pm
index 6a90176ec..44344d7f5 100644
--- a/extensions/Voting/Extension.pm
+++ b/extensions/Voting/Extension.pm
@@ -48,24 +48,13 @@ use constant DEFAULT_VOTES_PER_BUG => 1;
 use constant CMT_POPULAR_VOTES => 3;
 use constant REL_VOTER => 4;
 
-################
-# Installation #
-################
-
 BEGIN {
-    *Bugzilla::Bug::votes = \&votes;
+    *Bugzilla::Bug::user_votes = \&_bug_user_votes;
 }
 
-sub votes {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-
-    return $self->{votes} if exists $self->{votes};
-
-    $self->{votes} = $dbh->selectrow_array('SELECT votes FROM bugs WHERE bug_id = ?',
-                                           undef, $self->id);
-    return $self->{votes};
-}
+################
+# Installation #
+################
 
 sub db_schema_abstract_schema {
     my ($self, $args) = @_;
@@ -123,6 +112,15 @@ sub install_update_db {
 # Objects #
 ###########
 
+sub _bug_user_votes {
+    my ($self) = @_;
+    return $self->{'user_votes'} if exists $self->{'user_votes'};
+    $self->{'user_votes'} = Bugzilla->dbh->selectrow_array(
+        "SELECT vote_count FROM votes WHERE bug_id = ? AND who = ?", 
+        undef, $self->id, Bugzilla->user->id);
+    return $self->{'user_votes'};
+}
+
 sub object_columns {
     my ($self, $args) = @_;
     my ($class, $columns) = @$args{qw(class columns)};
@@ -678,7 +676,7 @@ sub _modify_bug_votes {
         }
     }
 
-    $changes->{'_too_many_votes'} = \@toomanyvotes_list;
+    $changes->{'too_many_votes'} = \@toomanyvotes_list;
 
     # 2. too many total votes for a single user.
     # This part doesn't work in the general case because _remove_votes
@@ -725,7 +723,7 @@ sub _modify_bug_votes {
         }
     }
 
-    $changes->{'_too_many_total_votes'} = \@toomanytotalvotes_list;
+    $changes->{'too_many_total_votes'} = \@toomanytotalvotes_list;
 
     # 3. enough votes to confirm
     my $bug_list = $dbh->selectcol_arrayref(
@@ -738,7 +736,7 @@ sub _modify_bug_votes {
         my $confirmed = _confirm_if_vote_confirmed($bug_id);
         push (@updated_bugs, $bug_id) if $confirmed;
     }
-    $changes->{'_confirmed_bugs'} = \@updated_bugs;
+    $changes->{'confirmed_bugs'} = \@updated_bugs;
 
     # Now that changes are done, we can send emails to voters.
     foreach my $msg (@msgs) {
@@ -748,7 +746,7 @@ sub _modify_bug_votes {
     foreach my $bug_id (@updated_bugs) {
         my $sent_bugmail = Bugzilla::BugMail::Send(
             $bug_id, { changer => Bugzilla->user });
-        $changes->{'_confirmed_bugs_sent_bugmail'}->{$bug_id} = $sent_bugmail;
+        $changes->{'confirmed_bugs_sent_bugmail'}->{$bug_id} = $sent_bugmail;
     }
 }
 
@@ -821,7 +819,7 @@ sub _remove_votes {
             };
 
             my $voter = new Bugzilla::User($userid);
-            my $template = Bugzilla->template_inner($voter->setting('lang'));
+            my $template = Bugzilla->template_inner($voter->settings->{'lang'}->{'value'});
 
             my $msg;
             $template->process("voting/votes-removed.txt.tmpl", $vars, \$msg);