From ed7ca64368d512574efeda0f6b8d8e970d41aa1d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 29 Jun 2008 10:21:19 +0000 Subject: [PATCH 1/1] Even more conflicting calls fixed --- .../ship-simu/templates/de/code/action_login_profile.ctp | 2 +- .../ship-simu/templates/de/code/action_login_status_problem.ctp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/ship-simu/templates/de/code/action_login_profile.ctp b/application/ship-simu/templates/de/code/action_login_profile.ctp index 841d63f..db9afe3 100644 --- a/application/ship-simu/templates/de/code/action_login_profile.ctp +++ b/application/ship-simu/templates/de/code/action_login_profile.ctp @@ -16,7 +16,7 @@ $helper->addFieldText('pass2', "Neues Passwort, Wiederholung:"); $helper->addInputPasswordField('pass2'); // Display current email -$helper->addFormNote('current_email', "Derzeitige Email-Adresse: ".$helper->getField('email').""); +$helper->addFormNote('current_email', "Derzeitige Email-Adresse: ".$helper->getValueField('email').""); // Only for changing email address if ($helper->ifEmailChangeAllowed()) { diff --git a/application/ship-simu/templates/de/code/action_login_status_problem.ctp b/application/ship-simu/templates/de/code/action_login_status_problem.ctp index 016dc89..88a47b1 100644 --- a/application/ship-simu/templates/de/code/action_login_status_problem.ctp +++ b/application/ship-simu/templates/de/code/action_login_status_problem.ctp @@ -15,7 +15,7 @@ if ($helper->ifUserAccountUnconfirmed()) { } elseif ($helper->ifUserAccountLocked()) { // Account is locked $helper->addFormNote('status_locked', "Dein Account wurde gesperrt! Grund der Sperre: - ".$helper->getField('lock_reason')." + ".$helper->getValueField('lock_reason')." Bitte melde dich beim Support, damit dieser dir weiterhelfen kann." ); } elseif ($helper->ifUserAccountGuest()) { -- 2.30.2