### Eclipse Workspace Patch 1.0
#P Limesurvey 1.x trunk stable
Index: common.php
===================================================================
--- common.php (revision 10258)
+++ common.php (working copy)
@@ -273,16 +273,16 @@
include_once($homedir.'/update/updater.php');
if(isset($_GET['continue']) && $_GET['continue']==1)
{
- echo CheckForDBUpgrades();
+ CheckForDBUpgrades();
echo "
".$clang->gT("Back to main menu")."";
updatecheck();
}
else
{
- $dbupgradeoutput='
';
- $dbupgradeoutput.= CheckForDBUpgrades();
- $dbupgradeoutput.='
';
- echo getAdminHeader() . $dbupgradeoutput . getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual"));
+ echo getAdminHeader(),
+ '',CheckForDBUpgrades(),'
',
+ getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual"))
+ ;
}
die;
}
Index: admin/install/index.php
===================================================================
--- admin/install/index.php (revision 10258)
+++ admin/install/index.php (working copy)
@@ -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.='
LimeSurvey Database is up to date. No action needed';}
else {$adminoutput.=$output;}
$adminoutput.="
Please log in.";