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

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

Revision: 255
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=255&view=rev
Author:   mennodekker
Date:     2011-11-21 15:51:49 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/library/classes/Gems/TabForm.php
    trunk/library/classes/Gems/Tracker/Token/TokenSelect.php

Modified: trunk/library/classes/Gems/TabForm.php
===================================================================
--- trunk/library/classes/Gems/TabForm.php	2011-11-21 13:02:57 UTC (rev 254)
+++ trunk/library/classes/Gems/TabForm.php	2011-11-21 15:51:49 UTC (rev 255)
@@ -57,7 +57,7 @@
      */
     public function addElement($element, $name = null, $options = null)
     {
-        if ($this->currentTab) {
+        if ($this->currentTab && !($element instanceof Zend_Form_Element_Hidden)) {
             return $this->currentTab->addElement($element, $name, $options);
         } else {
             return parent::addElement($element, $name, $options);

Modified: trunk/library/classes/Gems/Tracker/Token/TokenSelect.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Token/TokenSelect.php	2011-11-21 13:02:57 UTC (rev 254)
+++ trunk/library/classes/Gems/Tracker/Token/TokenSelect.php	2011-11-21 15:51:49 UTC (rev 255)
@@ -100,7 +100,9 @@
      */
     public function andReceptionCodes($fields = '*')
     {
-        $this->sql_select->join('gems__reception_codes', 'gto_reception_code = grc_id_reception_code');
+        $this->sql_select->join('gems__reception_codes', 
+                                'gto_reception_code = grc_id_reception_code',
+                                $fields);
 
         return $this;
     }

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