Fixed issue #14316: Unable to delete old survey or token table

Fixed issue : potential notice in checkintegrity
LimeSurvey · Dec 4, 2018 · e133fa5 · e133fa5
1 parent 9be6100
commit e133fa5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/application/controllers/admin/checkintegrity.php b/application/controllers/admin/checkintegrity.php
@@ -48,7 +48,6 @@ public function index()
 
     public function fixredundancy()
     {
-
         $oldsmultidelete = Yii::app()->request->getPost('oldsmultidelete', array());
         $aData = [];
         $aData['messages'] = array();

diff --git a/application/views/admin/checkintegrity/check_view.php b/application/views/admin/checkintegrity/check_view.php
@@ -293,7 +293,7 @@
                 <br /> <?php eT("No database action required!"); ?>
                 <?php } else
                 {?>
-                <?php echo CHtml::form(array("admin/checkintegrity/fixredundancy"), 'post');?>
+                <?php echo CHtml::form(array("admin/checkintegrity",array('sa'=>'fixredundancy'), 'post');?>
                     <ul class='data-redundancy-list list-unstyled'>
                         <?php
                             if (isset($redundantsurveytables))

diff --git a/application/views/admin/checkintegrity/fix_view.php b/application/views/admin/checkintegrity/fix_view.php
@@ -5,13 +5,13 @@
         <div class="jumbotron message-box">
                 <h2><?php eT("Data consistency check"); ?></h2>
                 <p class="lead"><?php eT("If errors are showing up you might have to execute this script repeatedly."); ?></p>
-                <p>
+                <?php if(!empty($messages)) { ?>
                     <ul>
                     <?php foreach ($messages as $sMessage) {?>
-                     <li><?php echo $sMessage;?></li>
+                        <li><?php echo $sMessage;?></li>
                     <?php } ?>
-                    </ul>           
-                </p>
+                    </ul>
+                <?php } ?>
                 <p>
                     <a class="btn btn-lg btn-success" href='<?php echo $this->createUrl('admin/checkintegrity');?>'><?php eT("Check again"); ?></a>
                 </p>