Fixed issue #5217: Update function output logic - patch by mot

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@10268 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jun 15, 2011 · d26fd05 · d26fd05
1 parent e6c077a
commit d26fd05
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/admin/install/index.php b/admin/install/index.php
@@ -60,7 +60,9 @@
     //DB EXISTS, CHECK FOR APPROPRIATE UPGRADES
     $connect->database = $databasename;
     $connect->Execute("USE DATABASE `$databasename`");
-    $output=CheckForDBUpgrades();
+    ob_start();
+    CheckForDBUpgrades();
+    $output=ob_get_clean();
     if ($output== '') {$adminoutput.='<br />LimeSurvey Database is up to date. No action needed';}
     else {$adminoutput.=$output;}
     $adminoutput.="<br />Please <a href='$homeurl/$scriptname'>log in.</a>";

diff --git a/common.php b/common.php
@@ -272,17 +272,19 @@
         $clang = new limesurvey_lang($defaultlang);
         include_once($homedir.'/update/updater.php');
         if(isset($_GET['continue']) && $_GET['continue']==1) 
-        {   
-            echo CheckForDBUpgrades();
+        {
+            echo getAdminHeader();
+            CheckForDBUpgrades();
             echo "<br /><a href='$homeurl'>".$clang->gT("Back to main menu")."</a></div>";
-            updatecheck();                     
-        }        
+            updatecheck();
+            echo getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual"));                         
+        }
         else
         {   
-            $dbupgradeoutput='<div class="messagebox">';
-            $dbupgradeoutput.= CheckForDBUpgrades();                    
-            $dbupgradeoutput.='</div>';
-            echo getAdminHeader() . $dbupgradeoutput . getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual"));            
+            echo getAdminHeader(),
+                 '<div class="messagebox">',CheckForDBUpgrades(),'</div>', 
+                 getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual"))
+                 ;
         }        
         die;
     }