Changeset 1508 for branches/3.0

Timestamp:

11/25/2006 02:42:54 PM (2 years ago)

Author:

xue

Message:

constructUrl encodes ampersand by default now.

Location:

branches/3.0

Files:

• HISTORY (modified) (1 diff)
• UPGRADE (modified) (1 diff)
• framework/Web/Services/TPageService.php (modified) (1 diff)
• framework/Web/THttpRequest.php (modified) (1 diff)
• framework/Web/THttpResponse.php (modified) (1 diff)

branches/3.0/HISTORY

@@ -7 +7 @@
 CHG: Ticket#454 - Redundant PHP Version Check
 CHG: TRepeater does not render <span> anymore for empty item template (Qiang)
+CHG: THttpRequest.constructUrl() now encodes ampersand by default (Qiang)
 
 Version 3.0.5 October 23, 2006

branches/3.0/UPGRADE

@@ -17 +17 @@
 ---------------------
 - TRepeater does not render <span> anymore for empty item template.
+- constructUrl() now encodes ampersand by default. This should have minimal
+  impact on any existing PRADO applications, though.
 
 Upgrading from v3.0.4

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

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

branches/3.0/framework/Web/THttpRequest.php

@@ -488 +488 @@
          * @see parseUrl
          */
-        public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=false,$encodeGetItems=true)
+        public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)
         {
                 $url=$serviceID.'='.$serviceParam;

branches/3.0/framework/Web/THttpResponse.php

@@ -286 +286 @@
                 if($url[0]==='/')
                         $url=$this->getRequest()->getBaseUrl().$url;
-                header('Location: '.$url);
+                header('Location: '.str_replace('&','&',$url));
                 exit();
         }