Fixed issue #7139: Warning after updating from 2.00 to most current u…

…pdate release
LimeSurvey · Jan 5, 2013 · 0205393 · 0205393
1 parent 72ca32d
commit 0205393
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/application/controllers/admin/update.php b/application/controllers/admin/update.php
@@ -369,12 +369,11 @@ function step4()
             {
                 if (is_file($rootdir.$afile['file']))
                 {
-                    unlink($rootdir.$afile['file']);
+                    @unlink($rootdir.$afile['file']);
                 }
                 else{
                     rmdirr($rootdir.$afile['file']);
                 }
-                echo sprintf($clang->gT('File deleted: %s'),$afile['file']).'<br />';
             }
         }
 

diff --git a/application/views/admin/survey/prepareEditorScript_view.php b/application/views/admin/survey/prepareEditorScript_view.php
@@ -1,7 +1,7 @@
 <script type="text/javascript" src="<?php echo Yii::app()->getConfig('sCKEditorURL'); ?>/ckeditor.js"></script>
 <script type='text/javascript'>
     <!--
-    var sReplacementFieldTitle = '<?php $clang->eT('LameSurvey replacement field properties','js');?>';
+    var sReplacementFieldTitle = '<?php $clang->eT('LimeSurvey replacement field properties','js');?>';
     var sReplacementFieldButton = '<?php $clang->eT('Insert/edit LimeSurvey replacement field','js');?>';
     var editorwindowsHash = new Object();
     function find_popup_editor(fieldname)