1 files changed, 1 insertions, 46 deletions

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index e523db6ae..0087b3b85 100755
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -2560,7 +2560,7 @@ sub choices {
     }
 
     # Hack - this array contains "". See bug 106589.
-    my @res = grep ($_, @{settable_resolutions()});
+    my @res = grep ($_, @{get_legal_field_values('resolution')});
 
     $self->{'choices'} =
       {
@@ -2579,22 +2579,6 @@ sub choices {
     return $self->{'choices'};
 }
 
-# List of resolutions that may be set directly by hand in the bug form.
-# 'MOVED' and 'DUPLICATE' are excluded from the list because setting
-# bugs to those resolutions requires a special process.
-sub settable_resolutions {
-    my $resolutions = get_legal_field_values('resolution');
-    my $pos = lsearch($resolutions, 'DUPLICATE');
-    if ($pos >= 0) {
-        splice(@$resolutions, $pos, 1);
-    }
-    $pos = lsearch($resolutions, 'MOVED');
-    if ($pos >= 0) {
-        splice(@$resolutions, $pos, 1);
-    }
-    return $resolutions;
-}
-
 sub votes {
     my ($self) = @_;
     return 0 if $self->{error};
@@ -2624,35 +2608,6 @@ sub bug_alias_to_id {
 }
 
 #####################################################################
-# Workflow Control routines
-#####################################################################
-
-sub process_knob {
-    my ($self, $action, $to_resolution, $dupe_of) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    return if $action eq 'none';
-
-    my $dupe_move_status = Bugzilla->params->{'duplicate_or_move_bug_status'};
-    if ($action eq 'duplicate') {
-        $self->set_status($dupe_move_status,
-                          {resolution => 'DUPLICATE', dupe_of => $dupe_of});
-    }
-    elsif ($action eq 'move') {
-        $self->set_status($dupe_move_status, {resolution => 'MOVED'});
-    }
-    elsif ($action eq 'change_resolution') {
-        $self->set_resolution($to_resolution);
-    }
-    elsif ($action eq 'clearresolution') {
-        $self->clear_resolution();
-    }
-    else {
-        $self->set_status($action, {resolution => $to_resolution});
-    }
-}
-
-#####################################################################
 # Subroutines
 #####################################################################