Changeset 1497 for branches/3.0

Show
Ignore:
Timestamp:
11/18/2006 07:21:32 AM (2 years ago)
Author:
xue
Message:

fixed #454. reverted back constructUrl so that ampersand is not encoded by default.

Location:
branches/3.0
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • branches/3.0/HISTORY

    r1491 r1497  
    55ENH: Ticket#446 - Added TMetaTagCollection.getMetaTagByID method (Qiang) 
    66CHG: Ticket#437 - __autoload is replaced by spl_autoload_register (Qiang) 
    7 CHG: constructUrl() now encodes & into & by default (Qiang) 
     7CHG: Ticket#454 - Redundant PHP Version Check 
    88CHG: TRepeater does not render <span> anymore for empty item template (Qiang) 
    99 

  • branches/3.0/UPGRADE

    r1481 r1497  
    1616Upgrading from v3.0.5 
    1717--------------------- 
    18 - constructUrl() now encodes & into &amp; by default. 
    1918- TRepeater does not render <span> anymore for empty item template. 
    2019 

  • branches/3.0/framework/TApplication.php

    r1397 r1497  
    13181318                { 
    13191319                        $fileName=$this->getStateFilePath(); 
    1320                         if(version_compare(phpversion(),'5.1.0','>=')) 
    1321                                 file_put_contents($fileName,$content,LOCK_EX); 
    1322                         else 
    1323                                 file_put_contents($fileName,$content); 
     1320                        file_put_contents($fileName,$content,LOCK_EX); 
    13241321                } 
    13251322        } 

  • branches/3.0/framework/Web/Services/TPageService.php

    r1487 r1497  
    463463         * @param string page path 
    464464         * @param array list of GET parameters, null if no GET parameters required 
    465          * @param boolean whether to encode the ampersand in URL, defaults to true. 
     465         * @param boolean whether to encode the ampersand in URL, defaults to false. 
    466466         * @param boolean whether to encode the GET parameters (their names and values), defaults to true. 
    467467         * @return string URL for the page and GET parameters 
    468468         */ 
    469         public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true) 
     469        public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=false,$encodeGetItems=true) 
    470470        { 
    471471                return $this->getRequest()->constructUrl($this->getID(),$pagePath,$getParams,$encodeAmpersand,$encodeGetItems); 

  • branches/3.0/framework/Web/THttpRequest.php

    r1481 r1497  
    484484         * @param array GET parameters, null if not needed 
    485485         * @param boolean whether to encode the ampersand in URL, defaults to true. 
    486          * @param boolean whether to encode the GET parameters (their names and values), defaults to true. 
     486         * @param boolean whether to encode the GET parameters (their names and values), defaults to false. 
    487487         * @return string URL 
    488488         * @see parseUrl 
    489489         */ 
    490         public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true) 
     490        public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=false,$encodeGetItems=true) 
    491491        { 
    492492                $url=$serviceID.'='.$serviceParam;