Conflicts

workflow/engine/classes/class.derivation.php

@@ -2285,4 +2285,5 @@ class Derivation
         }
         return $iNewDelIndex;
     }
+
 }

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();

workflow/engine/templates/login/init.js

@@ -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);
-
-});