Merge branch 'Yii' of ssh://github.com/SamMousa/LimeSurvey into 2.1

LimeSurvey · Aug 9, 2012 · 831132a · 831132a
2 parents bdefcbc + 10ca976
commit 831132a
Show file tree

Hide file tree

Showing 128 changed files with 11 additions and 23,395 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -7288,26 +7288,26 @@ function getHeader($meta = false)
         $languagecode = Yii::app()->getConfig('defaultlang');
     }
 
-    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=\"{$languagecode}\" lang=\"{$languagecode}\"";
+    if (getLanguageRTL($languagecode))
     {
-        $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=\"{$languagecode}\" lang=\"{$languagecode}\"";
-        if (getLanguageRTL($languagecode))
-        {
-            $header.=" dir=\"rtl\" ";
-        }
-        $header.= ">\n\t<head>\n";
+        $header.=" dir=\"rtl\" ";
+    }
+    $header.= ">\n\t<head>\n";
 
-        if ($meta)
-            $header .= $meta;
+    if ($meta)
+        $header .= $meta;
 
+    if ( !$embedded )
+    {
         return $header;
     }
 
     global $embedded_headerfunc;
 
     if ( function_exists( $embedded_headerfunc ) )
-        return $embedded_headerfunc();
+        return $embedded_headerfunc($header);
 }