Even more conflicting calls fixed

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 841d63f44b47055db583788c5a9115648a128a80..db9afe3faaf9c66e06f3f99347271deaae5a731e 100644 (file)
--- 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->addInputPasswordField('pass2');
 
 // Display current email

-$helper->addFormNote('current_email', "Derzeitige Email-Adresse: <span id=\"displayed_field\">".$helper->getField('email')."</span>");
+$helper->addFormNote('current_email', "Derzeitige Email-Adresse: <span id=\"displayed_field\">".$helper->getValueField('email')."</span>");

 
 // Only for changing email address
 if ($helper->ifEmailChangeAllowed()) {
 
 // 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 016dc89830d093046c3054d1d6ee31a84fb50db2..88a47b1523350a460df692f714a8fc7a8247da3b 100644 (file)
--- 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:
 } elseif ($helper->ifUserAccountLocked()) {
        // Account is locked
        $helper->addFormNote('status_locked', "Dein Account wurde gesperrt! Grund der Sperre:

-               <span id=\"lock_reason\">".$helper->getField('lock_reason')."</span>
+               <span id=\"lock_reason\">".$helper->getValueField('lock_reason')."</span>

                Bitte melde dich beim Support, damit dieser dir weiterhelfen kann."
        );
 } elseif ($helper->ifUserAccountGuest()) {
                Bitte melde dich beim Support, damit dieser dir weiterhelfen kann."
        );
 } elseif ($helper->ifUserAccountGuest()) {