Merge branch 'develop' into customFields

diff --cc index.php
Simple merge

diff --cc models/admin/contacts/index.php
index f6430a7,a96072e..acfdf7d
--- 1/models/admin/contacts/index.php
--- 2/models/admin/contacts/index.php
+++ b/models/admin/contacts/index.php
@@@ -691,46 -731,45 +741,48 @@@ class GlmMembersAdmin_contacts_index ex
  
          // Compile template data
          $templateData = array(
-             'option'                    => $option,
-             'loggedInMember'            => $loggedInMember,
-             'fromMemberMenu'            => $fromMemberMenu,
-             'haveMember'                => $haveMember,
-             'memberID'                  => $this->memberID,
-             'memberData'                => $memberData,
-             'memberName'                => $memberName,
-             'membersList'               => $membersList,
-             'refType'                   => $refType,
-             'refTypeName'               => $refTypeName,
-             'haveContacts'              => $haveContacts,
-             'contactsList'              => $contactsList['list'],
-             'numbContacts'              => $numbContacts,
-             'contactID'                 => $contactID,
-             'contactInfo'               => $contactInfo,
-             'newContactEmailExists'     => $newContactEmailExists,
-             'newContactUsernameExists'  => $newContactUsernameExists,
-             'misMatchedWpUsers'         => $misMatchedWpUsers,
-             'usernameChangedToWP'       => $usernameChangedToWP,
-             'newContactCreated'         => $newContactCreated,
-             'usingExistingWPContact'    => $usingExistingWPContact,
-             'contactUpdated'            => $contactUpdated,
-             'filterArchived'            => $filterArchived,
-             'filterText'                => $filterText,
-             'haveFilter'                => $haveFilter,
-             'userDeleted'               => $userDeleted,
-             'wpUserDeleted'             => $wpUserDeleted,
-             'contactMembers'            => $contactMembers,
-             'numbDisplayed'             => $numbDisplayed,
-             'lastDisplayed'             => $lastDisplayed,
-             'paging'                    => $paging,
-             'prevStart'                 => $prevStart,
-             'nextStart'                 => $nextStart,
-             'start'                     => $start = 1,
-             'limit'                     => $limit,
-             'namesList'                 => $namesList,
-             'EntityManagerRole'         => $this->config['contact_role_numb']['EntityManager'],
-             'slug'                      => GLM_MEMBERS_CONTACTS_PLUGIN_SLUG,
-             'customFieldResults'        => $customFieldResults
+             'option'                   => $option,
+             'loggedInMember'           => $loggedInMember,
+             'fromMemberMenu'           => $fromMemberMenu,
+             'haveMember'               => $haveMember,
+             'memberID'                 => $this->memberID,
+             'memberData'               => $memberData,
+             'memberName'               => $memberName,
+             'membersList'              => $membersList,
+             'refType'                  => $refType,
+             'refTypeName'              => $refTypeName,
+             'haveContacts'             => $haveContacts,
+             'contactsList'             => $contactsList['list'],
+             'numbContacts'             => $numbContacts,
+             'contactID'                => $contactID,
+             'contactInfo'              => $contactInfo,
+             'newContactEmailExists'    => $newContactEmailExists,
+             'newContactUsernameExists' => $newContactUsernameExists,
+             'misMatchedWpUsers'        => $misMatchedWpUsers,
+             'usernameChangedToWP'      => $usernameChangedToWP,
+             'newContactCreated'        => $newContactCreated,
+             'usingExistingWPContact'   => $usingExistingWPContact,
+             'contactUpdated'           => $contactUpdated,
+             'filterArchived'           => $filterArchived,
+             'filterText'               => $filterText,
+             'haveFilter'               => $haveFilter,
+             'userDeleted'              => $userDeleted,
+             'wpUserDeleted'            => $wpUserDeleted,
+             'contactMembers'           => $contactMembers,
+             'new_email'                => $newEmail,
+             'newEmailError'            => $newEmailError,
+             'numbDisplayed'            => $numbDisplayed,
+             'lastDisplayed'            => $lastDisplayed,
+             'paging'                   => $paging,
+             'prevStart'                => $prevStart,
+             'nextStart'                => $nextStart,
+             'start'                    => $start = 1,
+             'limit'                    => $limit,
+             'namesList'                => $namesList,
 -            'EntityManagerRole'        => $this->config['contact_role_numb']['EntityManager']
++            'EntityManagerRole'        => $this->config['contact_role_numb']['EntityManager'],
++            'slug'                     => GLM_MEMBERS_CONTACTS_PLUGIN_SLUG,
++            'customFieldResults'       => $customFieldResults
 +
          );
  
          // Return status, any suggested view, and any data to controller

diff --cc models/admin/profile/index.php
index 3a38ddb,10c22ee..6357d39
--- 1/models/admin/profile/index.php
--- 2/models/admin/profile/index.php
+++ b/models/admin/profile/index.php
@@@ -117,12 -117,13 +117,14 @@@ class GlmMembersAdmin_profile_index ext
      public function modelAction($actionData = false)
      {
  
 -        $option         = 'edit';
 -        $contactUpdated = false;
 -        $contactMembers = false;
 -        $membersList    = false;
 +        $option             = 'edit';
 +        $contactUpdated     = false;
 +        $contactMembers     = false;
 +        $membersList        = false;
+         $newEmail       = false;
+         $newEmailError  = false;
 -        $view = 'admin/profile/index.html';
 +        $customFieldResults = false;
 +        $view               = 'admin/profile/index.html';
  
  
          $validOptions = array(

diff --cc views/admin/contacts/edit.html
index c7eb8d9,9755165..7ed5787
--- 1/views/admin/contacts/edit.html
--- 2/views/admin/contacts/edit.html
+++ b/views/admin/contacts/edit.html
@@@ -74,9 -74,13 +74,13 @@@
        {/if}
  
        {if $option == 'create'}
 -        <h2 class="glm-left">Add New Contact</h2>
 +        <h2>Add New Contact</h2>
        {else}
+         {if $newEmailError != ''}
+         <h2 class="glm-required glm-flash-updated">NOTE: Your new E-Mail address was not valid. Please see below.</h2>                            
+         {else}
          {if $contactUpdated}<h2 class="glm-notice glm-flash-updated">Contact Updated</h2>{/if}
+         {/if}
          <a id="deleteContactButton" class="button button-primary glm-button glm-right">Delete this Contact</a>
          <div id="deleteContactDialog" class="glm-dialog-box" title="Delete Contact">
              <center>