Merge branch 'master' into have-extension

Author: CyberShadow

Bugzilla/Install/DB.pm

@@ -4227,7 +4227,7 @@ sub _migrate_group_owners {
   my $dbh = Bugzilla->dbh;
   return if $dbh->bz_column_info('groups', 'owner_user_id');
   $dbh->bz_add_column('groups', 'owner_user_id', {TYPE => 'INT3'});
-  my $nobody = Bugzilla::User->check('[email protected]');
+  my $nobody = Bugzilla::User->check(Bugzilla->localconfig->nobody_user);
   $dbh->do('UPDATE groups SET owner_user_id = ?', undef, $nobody->id);
 }
 

Bugzilla/Install/Localconfig.pm

@@ -97,6 +97,7 @@ use constant LOCALCONFIG_VARS => (
   {name => 'memcached_namespace', default => "bugzilla:",},
   {name => 'urlbase',             default => '',},
   {name => 'canonical_urlbase',   lazy => 1},
+  {name => 'nobody_user',         default => '[email protected]'},
   {name => 'attachment_base',     default => '',},
   {name => 'ses_username',        default => '',},
   {name => 'ses_password',        default => '',},

Bugzilla/Test/MockParams.pm

@@ -54,13 +54,14 @@ sub import {
   $answers{user_info_class}   //= 'GitHubAuth,CGI';
   $answers{user_verify_class} //= 'GitHubAuth,DB';
 
-  if ($first_time++) {
+  if ($first_time++ == 0) {
     capture_merged {
       Bugzilla::Config::update_params();
     };
   }
   else {
     Bugzilla::Config::SetParam($_, $answers{$_}) for keys %answers;
+    Bugzilla::Config::write_params();
   }
 }
 

extensions/BMO/Extension.pm

@@ -972,7 +972,8 @@ sub object_end_of_create {
     # Add default searches to new user's footer
     my $dbh = Bugzilla->dbh;
 
-    my $sharer = Bugzilla::User->new({name => '[email protected]'}) or return;
+    my $sharer = Bugzilla::User->new({name => Bugzilla->localconfig->nobody_user})
+      or return;
     my $group = Bugzilla::Group->new({name => 'everyone'}) or return;
 
     foreach my $definition (@default_named_queries) {
@@ -1012,7 +1013,7 @@ sub _bug_reporters_hw_os {
 sub _bug_is_unassigned {
   my ($self) = @_;
   my $assignee = $self->assigned_to->login;
-  return $assignee eq '[email protected]' || $assignee =~ /@(?!invalid).+\.bugs$/;
+  return $assignee eq Bugzilla->localconfig->nobody_user || $assignee =~ /@(?!invalid).+\.bugs$/;
 }
 
 sub _bug_has_current_patch {
@@ -1192,7 +1193,7 @@ sub object_start_of_update {
 
   # and the assignee isn't a real person
   return
-    unless $new_bug->assigned_to->login eq '[email protected]'
+    unless $new_bug->assigned_to->login eq Bugzilla->localconfig->nobody_user
     || $new_bug->assigned_to->login =~ /@(?!invalid).+\.bugs$/;
 
   # and the user can set the status to NEW
@@ -1927,7 +1928,8 @@ sub _post_employee_incident_bug {
   my ($investigate_bug, $ssh_key_bug);
   my $old_user = Bugzilla->user;
   eval {
-    Bugzilla->set_user(Bugzilla::User->new({name => '[email protected]'}));
+    Bugzilla->set_user(Bugzilla::User->new(
+      {name => Bugzilla->localconfig->nobody_user}));
     my $new_user = Bugzilla->user;
 
     # HACK: User needs to be in the editbugs and primary bug's group to allow

extensions/BMO/bin/bug_1093952.pl

@@ -55,7 +55,7 @@
 print "Press <Ctrl-C> to stop or <Enter> to continue...\n";
 getc();
 
-my $nobody = Bugzilla::User->check({name => '[email protected]'});
+my $nobody = Bugzilla::User->check({name => Bugzilla->localconfig->nobody_user});
 my $field = Bugzilla::Field->check({name => 'status_whiteboard'});
 my $when = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
 

extensions/BMO/bin/migrate-github-pull-requests.pl

@@ -23,7 +23,7 @@
 use Bugzilla::Util qw(trim);
 
 my $dbh    = Bugzilla->dbh;
-my $nobody = Bugzilla::User->check({name => '[email protected]'});
+my $nobody = Bugzilla::User->check({name => Bugzilla->localconfig->nobody_user});
 my $field  = Bugzilla::Field->check({name => 'attachments.mimetype'});
 
 # grab list of suitable attachments

extensions/BMO/template/en/default/pages/group_admins.html.tmpl

@@ -41,7 +41,7 @@
             [% group.name FILTER html %]</span>
         </td>
         <td nowrap>
-          [% IF group.owner.login == '[email protected]' %]
+          [% IF group.owner.login == Bugzilla.localconfig.nobody_user %]
             &ndash;
           [% ELSE %]
             [% INCLUDE global/user.html.tmpl who = group.owner %]

extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl

@@ -19,7 +19,7 @@
 
   # these are used in a few places
   is_cced = bug.cc.contains(user.login);
-  unassigned = (bug.assigned_to.login == "[email protected]")
+  unassigned = (bug.assigned_to.login == Bugzilla.localconfig.nobody_user)
                || (bug.assigned_to.login.search('@(?!invalid).+\.bugs$'));
 
   # custom fields that have custom rendering, or should not be rendered

extensions/ComponentWatching/Extension.pm

@@ -23,7 +23,6 @@ use Bugzilla::Util qw(detaint_natural trim);
 our $VERSION = '2';
 
 use constant REQUIRE_WATCH_USER => 1;
-use constant DEFAULT_ASSIGNEE   => '[email protected]';
 
 use constant REL_COMPONENT_WATCHER => 15;
 
@@ -100,7 +99,7 @@ sub template_before_create {
 sub template_before_process {
   my ($self, $args) = @_;
   return unless $args->{file} eq 'admin/components/create.html.tmpl';
-  $args->{vars}{comp}{default_assignee}{login} = DEFAULT_ASSIGNEE;
+  $args->{vars}{comp}{default_assignee}{login} = Bugzilla->localconfig->nobody_user;
 }
 
 #

extensions/PhabBugz/lib/Util.pm

@@ -129,7 +129,7 @@ sub get_bug_role_phids {
 }
 
 sub is_bug_assigned {
-  return $_[0]->assigned_to->email ne '[email protected]';
+  return $_[0]->assigned_to->email ne Bugzilla->localconfig->nobody_user;
 }
 
 sub is_attachment_phab_revision {