Fixed issue #7136: Incorrect charset in header when viewing QA

LimeSurvey · Jan 5, 2013 · 72ca32d · 72ca32d
1 parent 16fae7e
commit 72ca32d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/application/controllers/admin/expressions.php b/application/controllers/admin/expressions.php
@@ -15,6 +15,7 @@
 class Expressions extends Survey_Common_Action {
 	function index()
 	{
+        header("Content-type: text/html; charset=UTF-8"); // needed for correct UTF-8 encoding
     ?>
 <!DOCTYPE html>
 <html>

diff --git a/application/views/admin/update/step4.php b/application/views/admin/update/step4.php
@@ -1,7 +1,8 @@
-<?php
-
-echo '<div class="header ui-widget-header">'.sprintf($clang->gT('ComfortUpdate step %s'),'4').'</div><div class="updater-background"><br />';
+<div class="header ui-widget-header">
+<?php echo sprintf($clang->gT('ComfortUpdate step %s'),'4');?>
 
+</div><div class="updater-background"><br />
+<?php
 if (!isset( Yii::app()->session['updateinfo']))
 {
 	$clang->eT('On requesting the update information from limesurvey.org there has been an error:').'<br />';
@@ -31,7 +32,6 @@
     $clang->eT('As a last step you should clear your browser cache now.');?> <br /> <?php
 }
 
-echo "<p><button onclick=\"window.open('".Yii::app()->getController()->createUrl("admin/globalsettings")."', '_top')\" >".$clang->gT('Back to main menu')."</button></p>";
-echo '</div>';
-
-?>
+echo "<p><button onclick=\"window.open('".Yii::app()->getController()->createUrl("admin/globalsettings")."', '_top')\" >".$clang->gT('Back to main menu'); ?>
+</button></p>
+</div>