Commit 89c4487f authored by Hendrik Rombach's avatar Hendrik Rombach
Browse files

Merge branch '2.4' into 3.1

parents 89297c72 75618179
...@@ -63,8 +63,8 @@ class GlobalData implements SubscriberInterface ...@@ -63,8 +63,8 @@ class GlobalData implements SubscriberInterface
public static function getSubscribedEvents() public static function getSubscribedEvents()
{ {
return [ return [
'Enlight_Controller_Action_PreDispatch_Frontend' => 'addSmartyGlobals', 'Enlight_Controller_Action_PostDispatchSecure_Frontend' => 'addSmartyGlobals',
'Enlight_Controller_Action_PreDispatch_Widgets' => 'addSmartyGlobals', 'Enlight_Controller_Action_PostDispatchSecure_Widgets' => 'addSmartyGlobals',
]; ];
} }
......
...@@ -15,12 +15,14 @@ ...@@ -15,12 +15,14 @@
<![CDATA[ <![CDATA[
[#30371] sUserCustomernumber und sUserBillingadressCompany zugefügt [#30371] sUserCustomernumber und sUserBillingadressCompany zugefügt
[#30354] Fix für die Kundenanmeldung [#30354] Fix für die Kundenanmeldung
[#30443] $netiUserData auf der Startseite füllen
]]> ]]>
</changes> </changes>
<changes lang="en"> <changes lang="en">
<![CDATA[ <![CDATA[
[#30371] added sUserCustomernumber and sUserBillingadressCompany [#30371] added sUserCustomernumber and sUserBillingadressCompany
[#30354] Fix for the customer login [#30354] Fix for the customer login
[#30443] Fill $netiUserData on the homepage
]]> ]]>
</changes> </changes>
</changelog> </changelog>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment