diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php index c82847df5..6fbcef6f9 100644 --- a/workflow/engine/methods/login/authentication.php +++ b/workflow/engine/methods/login/authentication.php @@ -427,19 +427,12 @@ try { setcookie("PM-TabPrimary", 101010010, time() + (24 * 60 * 60), '/'); } - $oHeadPublisher = &headPublisher::getSingleton(); - $oHeadPublisher->extJsInit = true; - - $oHeadPublisher->addExtJsScript('login/init', false); //adding a javascript file .js - $oHeadPublisher->assign('uriReq', $sLocation); - $oPluginRegistry =& PMPluginRegistry::getSingleton(); if ($oPluginRegistry->existsTrigger ( PM_AFTER_LOGIN )) { $oPluginRegistry->executeTriggers ( PM_AFTER_LOGIN , $_SESSION['USER_LOGGED'] ); } - G::RenderPage('publish', 'extJs'); - //G::header('Location: ' . $sLocation); + G::header('Location: ' . $sLocation); die; } catch ( Exception $e ) { $aMessage['MESSAGE'] = $e->getMessage(); diff --git a/workflow/engine/templates/login/init.js b/workflow/engine/templates/login/init.js deleted file mode 100644 index c0f129a4d..000000000 --- a/workflow/engine/templates/login/init.js +++ /dev/null @@ -1,14 +0,0 @@ -Ext.onReady(function(){ - location.href = uriReq; - - var hideMask = function () { - Ext.get('loading').remove(); - Ext.fly('loading-mask').fadeOut({ - remove:true, - callback : '' - }); - } - - hideMask.defer(250); - -});