Changeset 1563 for branches/3.0/framework/Web/THttpResponse.php

Timestamp:

12/04/2006 07:18:17 AM (2 years ago)

Author:

xue

Message:

undo 1562. Knut, sorry I have to undo your change because the original code is right and your change will cause BC break.

Files:

• branches/3.0/framework/Web/THttpResponse.php (modified) (3 diffs)

branches/3.0/framework/Web/THttpResponse.php

@@ -226 +226 @@
          * @param string mime type of the content.
          * @param array list of headers to be sent
-         * @param string alternative file name used in attachment disposition
          * @throws TInvalidDataValueException if the file cannot be found
          */
-        public function writeFile($fileName,$content=null,$mimeType=null,$headers=null,$displayName=null)
+        public function writeFile($fileName,$content=null,$mimeType=null,$headers=null)
         {
                 static $defaultMimeTypes=array(
@@ -253 +252 @@
                         }
                 }
+                $fn=basename($fileName);
                 if(is_array($headers))
                 {
@@ -266 +266 @@
                 header("Content-type: $mimeType");
                 header('Content-Length: '.($content===null?filesize($fileName):strlen($content)));
-                if($displayName === null) {
-                  $displayName = basename($fileName);
-                }
-                header("Content-Disposition: attachment; filename=\"$displayName\"");
+                header("Content-Disposition: attachment; filename=\"$fn\"");
                 header('Content-Transfer-Encoding: binary');
                 if($content===null)