From: Roland Haeder Date: Thu, 3 Sep 2015 19:34:35 +0000 (+0200) Subject: Merge branch 'master' of git.mxchange.org:/var/cache/git/repos/shipsimu X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=commitdiff_plain;h=cc7ee7b7d397101df2c42eb5a7454c9742378d5e Merge branch 'master' of git.mxchange.org:/var/cache/git/repos/shipsimu Signed-off-by: Roland Haeder --- cc7ee7b7d397101df2c42eb5a7454c9742378d5e diff --cc application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp index ccd073b,ccd073b..e4ec93c --- a/application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp +++ b/application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp @@@ -2,7 -2,7 +2,7 @@@ // Get helper instance for web forms. This will add the opening form-tag to // the helper's render cache which is simply a small variable in the class // BaseHelper. --$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, "shipsimu_profile")); ++$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, 'shipsimu_profile')); // Pre-fetch field data with a given registry key $helperInstance->prefetchValueInstance('user'); diff --cc core index 0d66949,0d66949..bc1160b --- a/core +++ b/core @@@ -1,1 -1,1 +1,1 @@@ --Subproject commit 0d669494ea8e28e1d49fb9622e9e446dfa8d8db2 ++Subproject commit bc1160b89c811d6e36a90be9d2fd3c1e13e01543