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

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

Revision: 567
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=567&view=rev
Author:   matijsdejong
Date:     2012-03-27 16:39:04 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
Active fix in RespondentUserDefinition.php
PhpDoc added to Lazy

Modified Paths:
--------------
    trunk/library/classes/Gems/User/RespondentUserDefinition.php
    trunk/library/classes/MUtil/Lazy.php

Modified: trunk/library/classes/Gems/User/RespondentUserDefinition.php
===================================================================
--- trunk/library/classes/Gems/User/RespondentUserDefinition.php	2012-03-27 15:07:22 UTC (rev 566)
+++ trunk/library/classes/Gems/User/RespondentUserDefinition.php	2012-03-27 16:39:04 UTC (rev 567)
@@ -59,6 +59,7 @@
         $select = new Zend_Db_Select($this->db);
         $select->from('gems__user_logins', array(
                     'user_login_id' => 'gul_id_user',
+                    'user_active'   => 'gul_can_login',
                     ))
                 ->join('gems__respondent2org', 'gul_login = gr2o_patient_nr AND gul_id_organization = gr2o_id_organization', array(
                     'user_login'       => 'gr2o_patient_nr',

Modified: trunk/library/classes/MUtil/Lazy.php
===================================================================
--- trunk/library/classes/MUtil/Lazy.php	2012-03-27 15:07:22 UTC (rev 566)
+++ trunk/library/classes/MUtil/Lazy.php	2012-03-27 16:39:04 UTC (rev 567)
@@ -145,7 +145,15 @@
         }
     }
 
-    public static function method($object, $method, $arg_array = null)
+    /**
+     * Return a lazy callable to an object
+     *
+     * @param Object $object
+     * @param string $method Method of the object
+     * @param mixed $arg_array1 Optional, first of any arguments to the call
+     * @return MUtil_Lazy_Call
+     */
+    public static function method($object, $method, $arg_array1 = null)
     {
         $args = array_slice(func_get_args(), 2);
         return new MUtil_Lazy_Call(array($object, $method), $args);

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