From 13610bf0369d0313a8d77265111cc12026a648b4 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Tue, 9 Jan 2018 13:05:14 -0500 Subject: [PATCH] bug fix for notices setup passwordError so it's not undefined. --- models/front/registrations/checkoutProcess.php | 4 ++++ models/front/registrations/register.php | 18 ++++++++++-------- views/front/registrations/register.html | 2 +- views/front/registrations/summary.html | 2 +- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/models/front/registrations/checkoutProcess.php b/models/front/registrations/checkoutProcess.php index 3dbeee3..16faf92 100644 --- a/models/front/registrations/checkoutProcess.php +++ b/models/front/registrations/checkoutProcess.php @@ -104,6 +104,8 @@ class GlmMembersFront_registrations_checkoutProcess extends GlmRegCartSupport $billing = false; $payment = false; $ccConfirmation = ''; + $emailError = false; + $passwordError = false; $Account = new GlmDataRegistrationsAccount($this->wpdb, $this->config); $Request = new GlmDataRegistrationsRegRequest($this->wpdb, $this->config); @@ -717,6 +719,8 @@ class GlmMembersFront_registrations_checkoutProcess extends GlmRegCartSupport 'reg_account_id' => $accountId, 'states_list' => $this->config['states'], 'country_list' => $this->config['countries'], + 'emailError' => $emailError, + 'passwordError' => $passwordError, ); // Return status, any suggested view, and any data to controller diff --git a/models/front/registrations/register.php b/models/front/registrations/register.php index 765c403..cacfe1f 100644 --- a/models/front/registrations/register.php +++ b/models/front/registrations/register.php @@ -39,7 +39,8 @@ public function modelAction($actionData = false) { $view = 'register'; - $emailError = ''; + $emailError = false; + $passwordError = false; $modelRedirect = false; // Create dummy reg array $reg for the template data. @@ -141,13 +142,14 @@ // Compile template data $templateData = array( - 'page' => 'register', - 'reg' => $reg, - 'emailError' => $emailError, - 'regUrl' => GLM_MEMBERS_REGISTRATIONS_SITE_BASE_URL.$this->config['settings']['canonical_reg_page'].'/', - 'loggedIn' => ( isset( $_SESSION['LoginAccount'] ) ) ? $_SESSION['LoginAccount']: false, - 'states_list' => $this->config['states'], - 'country_list' => $this->config['countries'], + 'page' => 'register', + 'reg' => $reg, + 'emailError' => $emailError, + 'passwordError' => $passwordError, + 'regUrl' => GLM_MEMBERS_REGISTRATIONS_SITE_BASE_URL.$this->config['settings']['canonical_reg_page'].'/', + 'loggedIn' => ( isset( $_SESSION['LoginAccount'] ) ) ? $_SESSION['LoginAccount']: false, + 'states_list' => $this->config['states'], + 'country_list' => $this->config['countries'], ); // Return status, any suggested view, and any data to controller return array( diff --git a/views/front/registrations/register.html b/views/front/registrations/register.html index e81db52..8833dd4 100644 --- a/views/front/registrations/register.html +++ b/views/front/registrations/register.html @@ -21,7 +21,7 @@
diff --git a/views/front/registrations/summary.html b/views/front/registrations/summary.html index 26b7899..8bc7bb3 100644 --- a/views/front/registrations/summary.html +++ b/views/front/registrations/summary.html @@ -44,7 +44,7 @@
-- 2.17.1