sync

diff --git a/HTML/FlexyFramework/Page.php b/HTML/FlexyFramework/Page.php
index 2cad9b2..d5f025d 100644 (file)
--- a/HTML/FlexyFramework/Page.php
+++ b/HTML/FlexyFramework/Page.php
@@ -223,8 +223,8 @@ class HTML_FlexyFramework_Page  {
         /* output the body if no masterTemplate is set */
         $options = PEAR::getStaticProperty('HTML_FlexyFramework','options');
         
-        
-        header('Content-Type: text/html;charset='.( empty($options['charset']) ? 'UTF-8' : $options['charset'] ));
+        $type = isset($this->contentType) ? $this->contentType : 'text/html'; 
+        header('Content-Type: '.$type.';charset='.( empty($options['charset']) ? 'UTF-8' : $options['charset'] ));
         
          
         if (!$this->masterTemplate) {

diff --git a/HTTP/Upload.php b/HTTP/Upload.php
index 2737d39..d2e77de 100644 (file)
--- a/HTTP/Upload.php
+++ b/HTTP/Upload.php
@@ -335,7 +335,7 @@ class HTTP_Upload extends HTTP_Upload_Error
             if (PEAR::isError($files)) {\r
                 // there was an error with the form.\r
                 // Create a faked upload embedding the error\r
-                $this->files['_error'] =  &new HTTP_Upload_File(\r
+                $this->files['_error'] =  new HTTP_Upload_File(\r
                                                        '_error', null,\r
                                                        null, null,\r
                                                        null, $files->getCode(),\r
@@ -853,4 +853,4 @@ class HTTP_Upload_File extends HTTP_Upload_Error
         return true;\r
     }\r
 }\r
-?>
\ No newline at end of file
+?>