Fixed issue #6279: "Cannot modify header information" warning after D…

…B update
LimeSurvey · Jul 6, 2012 · 4b03f4f · 4b03f4f
1 parent deb7331
commit 4b03f4f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/application/controllers/admin/update.php b/application/controllers/admin/update.php
@@ -533,20 +533,18 @@ function db($continue = null)
     {
         $clang = $this->getController()->lang;
         Yii::app()->loadHelper("update/update");
-        $getHeader = true;
         if(isset($continue) && $continue=="yes")
         {
             $aViewUrls['output'] = CheckForDBUpgrades($continue);
             updateCheck();
-            $getHeader = false;
+            $aData['display']['header'] = false;
         }
         else
         {
+            $aData['display']['header'] = true;
             $aViewUrls['output'] = CheckForDBUpgrades();
         }
 
-        $aData['display']['header'] = false;
-
         $this->_renderWrappedTemplate('update', $aViewUrls, $aData);
     }
 

diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -195,13 +195,13 @@ protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $
             $sViewPath .= $sAction . '/';
         }
 
-        // Send HTTP header 
-        header("Content-type: text/html; charset=UTF-8"); // needed for correct UTF-8 encoding
 
 
         // Header
         if(!isset($aData['display']['header']) || $aData['display']['header'] !== false)
         {
+            // Send HTTP header
+            header("Content-type: text/html; charset=UTF-8"); // needed for correct UTF-8 encoding
             Yii::app()->getController()->_getAdminHeader();
         }
 

diff --git a/application/helpers/update/update_helper.php b/application/helpers/update/update_helper.php
@@ -55,7 +55,7 @@ function ShowDBUpgradeNotice() {
     ."<li><b>" .$clang->gT('Table prefix') . ":</b> " . Yii::app()->db->tablePrefix . "</li>"
     ."<li><b>" .$clang->gT('Site name') . ":</b> " . Yii::app()->getConfig("sitename") . "</li>"
     ."<li><b>" .$clang->gT('Root URL') . ":</b> " . Yii::app()->getController()->createUrl('') . "</li>"
-    .'</ul>'
+    .'</ul><br/>'
     ."<p>"
     ."<a href='".Yii::app()->getController()->createUrl("admin/update/db/continue/yes")."'>" . $clang->gT('Click here to continue') . "</a>"
     ."</p>"