Fixed issue #6452: File Upload not working with embedded_layout use

LimeSurvey · Aug 9, 2012 · ce0a9a1 · ce0a9a1
1 parent 21ce425
commit ce0a9a1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/common_functions.php b/common_functions.php
@@ -4270,33 +4270,34 @@ function getHeader($meta = false)
     }
 
 
-    if ( !$embedded )
+
+    $header=  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
+    . "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"".$surveylanguage."\" lang=\"".$surveylanguage."\"";
+    if (getLanguageRTL($surveylanguage))
     {
-        $header=  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
-        . "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"".$surveylanguage."\" lang=\"".$surveylanguage."\"";
-        if (getLanguageRTL($surveylanguage))
-        {
-            $header.=" dir=\"rtl\" ";
-        }
-        $header.= ">\n\t<head>\n"
-        . $css_header
-        . "<script type=\"text/javascript\" src=\"".$rooturl."/scripts/jquery/jquery.js\"></script>\n"
-        . "<script type=\"text/javascript\" src=\"".$rooturl."/scripts/jquery/jquery-ui.js\"></script>\n"
-        . "<script type=\"text/javascript\" src=\"".$rooturl."/scripts/jquery/jquery.ui.touch-punch.min.js\"></script>\n"
-        . "<link href=\"".$rooturl."/scripts/jquery/css/start/jquery-ui.css\" media=\"all\" type=\"text/css\" rel=\"stylesheet\" />"
-        . "<link href=\"".$rooturl."/scripts/jquery/css/start/lime-progress.css\" media=\"all\" type=\"text/css\" rel=\"stylesheet\" />"
-        . $js_header;
-
-        if ($meta)
-            $header .= $meta;
+        $header.=" dir=\"rtl\" ";
+    }
+    $header.= ">\n\t<head>\n"
+    . $css_header
+    . "<script type=\"text/javascript\" src=\"".$rooturl."/scripts/jquery/jquery.js\"></script>\n"
+    . "<script type=\"text/javascript\" src=\"".$rooturl."/scripts/jquery/jquery-ui.js\"></script>\n"
+    . "<script type=\"text/javascript\" src=\"".$rooturl."/scripts/jquery/jquery.ui.touch-punch.min.js\"></script>\n"
+    . "<link href=\"".$rooturl."/scripts/jquery/css/start/jquery-ui.css\" media=\"all\" type=\"text/css\" rel=\"stylesheet\" />"
+    . "<link href=\"".$rooturl."/scripts/jquery/css/start/lime-progress.css\" media=\"all\" type=\"text/css\" rel=\"stylesheet\" />"
+    . $js_header;
+
+    if ($meta)
+        $header .= $meta;
 
+    if ( !$embedded )
+    {
         return $header;
     }
     else
     {
         global $embedded_headerfunc;
         if ( function_exists( $embedded_headerfunc ) )
-            return $embedded_headerfunc();
+            return $embedded_headerfunc($header);
     }
 }
 

diff --git a/docs/release_notes.txt b/docs/release_notes.txt
@@ -81,16 +81,13 @@ Thank you to everyone who helped with this new release!
 Changes from 1.92+ (build 120801) to 1.92+ (build 120808) August 8, 2012
 -Fixed issue #6424: Lastpage field not being added in MSSQL when upgrading from 1.85 or older (Carsten Schmitz)
 -Fixed issue #6439: Question type Array (numbers) does not work with numbers >10 as labels (Thomas White)
--Release 1.92+ Build 120808 (Carsten Schmitz)
 #Updated translation: Czech by slansky
 #Updated translation: German by c_schmitz
 #Updated translation: German (Informal) by c_schmitz
 #Updated translation: Malay by ayahanda
 #Updated translation: Polish by elisa
 #Updated translation: Turkish by kayazeren
 
-
-
 Changes from 1.92+ (build 120725) to 1.92+ (build 120801) August 1, 2012
 -Fixed issue #6066: File upload fails if single oder double quotes are used (Carsten Schmitz)
 -Fixed issue #6287: Unable to export QueXML with Postgresql 9.1 (Adam Zammit)