From 0754723ae1e4067e9f9f423a83294599f26591e5 Mon Sep 17 00:00:00 2001
From: Benn Oshrin <boshrin@users.noreply.github.com>
Date: Sun, 14 Jul 2024 17:02:04 -0400
Subject: [PATCH] Fix handling of AR-EmailAddress-2 (NOJIRA)

---
 .../ApiConnector/templates/ApiSources/fields.inc                | 2 +-
 app/src/Model/Table/EmailAddressesTable.php                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc b/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc
index 8bd3e6ec6..c469f6a67 100644
--- a/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc
+++ b/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc
@@ -30,7 +30,7 @@ if($vv_action == 'add' || $vv_action == 'edit') {
   
   print '<li class="info-title"><h3>' . __d('api_connector', 'field.ApiSources.push_mode') . '</h3></li>';
 
-  print $this->element('banner', [
+  print $this->element('notify/banner', [
     'info' => __d('api_connector', 'information.endpoint.push', [$vv_push_endpoint])
   ]);
 
diff --git a/app/src/Model/Table/EmailAddressesTable.php b/app/src/Model/Table/EmailAddressesTable.php
index d2c25bad3..2bd309af3 100644
--- a/app/src/Model/Table/EmailAddressesTable.php
+++ b/app/src/Model/Table/EmailAddressesTable.php
@@ -154,7 +154,7 @@ public function afterMarshal(
     \ArrayObject $data, 
     \ArrayObject $options
   ) {
-    if(!empty($entity->person_id) && $entity->isDirty('mail')) {
+    if(!$entity->isNew() && !empty($entity->person_id) && $entity->isDirty('mail')) {
       // AR-EmailAddress-2 Editing an Email Address (but not its Type) associated
       // with a Person will revert it to unverified.