Changeset 1756

Show
Ignore:
Timestamp:
03/09/2007 03:49:48 PM (21 months ago)
Author:
xue
Message:

merge from 3.0 branch till 1755.

Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • trunk/HISTORY

    r1752 r1756  
    5353BUG: Ticket#505 - cultureInfo::getEnglishName does not return an arrary (Wei) 
    5454BUG: Ticket#508 - CultureInfo class: PHP Notice because of missing static declaration (Wei) 
     55BUG: Ticket#558 - TRadionButtonList generates a empty onclick attribute (Qiang) 
    5556BUG: typo in THttpResponse.writeFile() about sending headers (Qiang) 
    5657 
  • trunk/framework/Web/UI/WebControls/TCheckBox.php

    r1747 r1756  
    281281                        $value=$attributes->remove('value'); 
    282282                        // onclick js should only be added to input tag 
    283                         $onclick=$attributes->remove('onclick'); 
     283                        if(($onclick=$attributes->remove('onclick'))===null) 
     284                                $onclick=''; 
    284285                        if($attributes->getCount()) 
    285286                        { 
  • trunk/framework/Web/UI/WebControls/THiddenField.php

    r1668 r1756  
    6060                if(($value=$this->getValue())!=='') 
    6161                        $writer->addAttribute('value',$value); 
     62 
     63                if($this->getHasAttributes()) 
     64                { 
     65                        foreach($this->getAttributes() as $name=>$value) 
     66                                $writer->addAttribute($name,$value); 
     67                } 
     68 
    6269                $writer->renderBeginTag('input'); 
    6370                $writer->renderEndTag();