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

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

Revision: 674
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=674&view=rev
Author:   matijsdejong
Date:     2012-05-07 12:03:15 +0000 (Mon, 07 May 2012)
Log Message:
-----------
Commented change #667 out: did not work when parent class was loaded through constant declaration
Other changes concern whitespace and unused parameter

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/RespondentAction.php
    trunk/library/classes/Gems/Loader/LoaderAbstract.php
    trunk/library/classes/Gems/User/UserLoader.php

Modified: trunk/library/classes/Gems/Default/RespondentAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentAction.php	2012-05-07 11:51:02 UTC (rev 673)
+++ trunk/library/classes/Gems/Default/RespondentAction.php	2012-05-07 12:03:15 UTC (rev 674)
@@ -200,7 +200,7 @@
      */
     public function createModel($detailed, $action)
     {
-        $model = $this->loader->getModels()->getRespondentModel($detailed, $action);
+        $model = $this->loader->getModels()->getRespondentModel($detailed);
 
         if ($detailed) {
         	$model->set('gr2o_comments',     'label', $this->_('Comments'));

Modified: trunk/library/classes/Gems/Loader/LoaderAbstract.php
===================================================================
--- trunk/library/classes/Gems/Loader/LoaderAbstract.php	2012-05-07 11:51:02 UTC (rev 673)
+++ trunk/library/classes/Gems/Loader/LoaderAbstract.php	2012-05-07 12:03:15 UTC (rev 674)
@@ -159,15 +159,14 @@
         /**
          * First check if the class was already loaded with one of the prefixes
          * If so, we don't have to try loading from the other paths
-         */
+         * /
         foreach ($this->_dirs as $prefix => $path) {
             if (class_exists($prefix.$cname, false) && $obj = $this->_loadClassPath('', $prefix . $cname, $create, $arguments)) {
                 $found = true;
                 break;
             }
-        }
+        } // */
 
-
         if (!$found) {
             foreach ($this->_dirs as $prefix => $path) {
                 $fprefix = str_replace('_', '/', $prefix);

Modified: trunk/library/classes/Gems/User/UserLoader.php
===================================================================
--- trunk/library/classes/Gems/User/UserLoader.php	2012-05-07 11:51:02 UTC (rev 673)
+++ trunk/library/classes/Gems/User/UserLoader.php	2012-05-07 12:03:15 UTC (rev 674)
@@ -491,7 +491,7 @@
         if ($this->isProjectUser($login_name)) {
             return $this->loadUser(self::USER_PROJECT, $organization, $login_name);
         }
-        
+
         if ((null == $login_name) || (null == $organization)) {
             return $this->loadUser(self::USER_NOLOGIN, $organization, $login_name);
         }

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