Changeset 2438

Show
Ignore:
Timestamp:
04/18/2008 12:12:59 PM
Author:
mikl
Message:

Fix #660

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/framework/Web/Javascripts/TJSON.php

    r1739 r2438  
    147147 
    148148            case 'string': 
     149                if (($g=Prado::getApplication()->getGlobalization(false))!==null &&  
     150                    strtoupper($enc=$g->getCharset())!='UTF-8') 
     151                        $var=iconv($enc, 'UTF-8', $var); 
     152                         
    149153                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT 
    150154                $ascii = ''; 

  • trunk/framework/Web/UI/TPage.php

    r2391 r2438  
    282282 
    283283                $this->setAdapter(new TActivePageAdapter($this)); 
     284 
     285        // Decode Callback postData from UTF-8 to current Charset 
     286        if (($g=$this->getApplication()->getGlobalization(false))!==null &&  
     287            strtoupper($enc=$g->getCharset())!='UTF-8') 
     288                foreach ($this->_postData as $k=>$v) 
     289                    $this->_postData[$k]=iconv('UTF-8',$enc.'//IGNORE',$v); 
    284290 
    285291                Prado::trace("Page onPreInit()",'System.Web.UI.TPage');