[Gemstracker-svn] SF.net SVN: gemstracker:[302] trunk/library/classes/Gems

[<gem...@li...>]

Revision: 302
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=302&view=rev
Author:   matijsdejong
Date:     2011-11-28 18:34:53 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Switching order in IndexAction.php selects the right organization for the url (the first time)
MUtil_Echo::track commented out

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/IndexAction.php
    trunk/library/classes/Gems/Tracker/Token.php

Modified: trunk/library/classes/Gems/Default/IndexAction.php
===================================================================
--- trunk/library/classes/Gems/Default/IndexAction.php	2011-11-28 18:24:32 UTC (rev 301)
+++ trunk/library/classes/Gems/Default/IndexAction.php	2011-11-28 18:34:53 UTC (rev 302)
@@ -294,16 +294,16 @@
      */
     public function loginAction()
     {
-        $form = $this->_getLoginForm();
-        
         $request = $this->getRequest();
-        
+
         // Allow layout switching based on request base url
         if ($this->escort instanceof Gems_Project_Layout_MultiLayoutInterface) {
             $hostUrl = $this->escort->loader->getUtil()->getCurrentURI();
-            
+
+            // MUtil_Echo::track($hostUrl);
+
             $organizationId = $this->util->getDbLookup()->getOrganizationForUrl($hostUrl);
-            
+
             if ($organizationId) {
                 $user = $this->escort->getLoader()->getUserLoader()->getCurrentUser();
                 $user->setCurrentOrganization($organizationId);
@@ -311,6 +311,8 @@
             }
         }
 
+        $form = $this->_getLoginForm();
+
         if ($request->isPost()) {
             if ($form->isValid($request->getPost(), false)) {
 

Modified: trunk/library/classes/Gems/Tracker/Token.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Token.php	2011-11-28 18:24:32 UTC (rev 301)
+++ trunk/library/classes/Gems/Tracker/Token.php	2011-11-28 18:34:53 UTC (rev 302)
@@ -1123,7 +1123,7 @@
         if ($comment) {
             $values['gto_comment'] = $comment;
         }
-        MUtil_Echo::track($values);
+        // MUtil_Echo::track($values);
 
         $changed = $this->_updateToken($values, $userId);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.