Fixed issue #7189: Successful update on ComfortUpdate shows update er…

…ror in step 4
LimeSurvey · Jan 22, 2013 · afd683a · afd683a
1 parent d1e7597
commit afd683a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/application/controllers/admin/update.php b/application/controllers/admin/update.php
@@ -422,7 +422,7 @@ function step4()
         // We create this new language object here because the language files might have been overwritten earlier
         // and the pointers to the file from the application language are not valid anymore 
         $aLanguage = new Limesurvey_lang(Yii::app()->session['adminlang']);
-        $aData = array('clang' => $aLanguage);
+        $aData['clang'] = $aLanguage;
 
         $this->_renderWrappedTemplate('update', 'step4', $aData);
     }

diff --git a/application/views/admin/update/step2.php b/application/views/admin/update/step2.php
@@ -42,9 +42,10 @@
     }
     if (count($existingfiles)>0)
     {
-        $clang->eT('The following files would be added by the update but already exist. This is very unusual and may be co-incidental.').'<br />';
-        $clang->eT('We recommend that these files should be replaced by the update procedure.').'<br />';
-        echo '<ul>';
+        $clang->eT('The following files would be added by the update but already exist. This is very unusual and may be co-incidental.');?><br />
+        <?php  $clang->eT('We recommend that these files should be replaced by the update procedure.');?><br />
+        <ul>
+        <?php
         sort($existingfiles);
         foreach ($existingfiles as $existingfile)
         {
@@ -55,9 +56,11 @@
 
     if (count($modifiedfiles)>0)
     {
-        $clang->eT('The following files will be modified or deleted but were already modified by someone else.').'<br />';
-        $clang->eT('We recommend that these files should be replaced by the update procedure.').'<br />';
-        echo '<ul>';
+        $clang->eT('The following files will be modified or deleted but were already modified by someone else.');?><br />
+        <?php
+        $clang->eT('We recommend that these files should be replaced by the update procedure.');?><br />
+        <ul> 
+        <?php
         sort($modifiedfiles);
         foreach ($modifiedfiles as $modifiedfile)
         {