Merge "Ensure dummy admin email is changed on install (Bug #1378581)"

htdocs/admin/cli/install.php

@@ -80,6 +80,10 @@ $userobj = $userobj->find_by_username('admin');
 $userobj->email = $adminemail;
 $userobj->commit();
 
+// Ensure that the dummy admin email is changed
+update_record('artefact_internal_profile_email', array('email' => $adminemail), array('owner' => $userobj->id));
+update_record('artefact', array('title' => $adminemail), array('owner' => $userobj->id, 'artefacttype' => 'email'));
+
 // Password changes should be performed by the authfactory
 $authobj = AuthFactory::create($userobj->authinstance);
 $authobj->change_password($userobj, $adminpassword, true);

htdocs/auth/lib.php

@@ -1023,6 +1023,7 @@ function requiredfields_submit(Pieform $form, $values) {
                     // we are dealing with the dummy email that is set on install
                     update_record('usr', array('email' => $email), array('id' => $USER->get('id')));
                     update_record('artefact_internal_profile_email', array('email' => $email), array('owner' => $USER->get('id')));
+                    update_record('artefact', array('title' => $email), array('owner' => $USER->get('id'), 'artefacttype' => 'email'));
                 }
             }
             // Check if a validation email has been sent, if not send one