From 142da875c39f740d7c1f2283fa9e942d02b72322 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Mon, 26 Sep 2022 08:36:57 +0800
Subject: [PATCH] * Fix bug #27891,27610.

---
 module/file/view/export2csv.html.php | 15 +++++++++------
 module/port/view/header.html.php     |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/module/file/view/export2csv.html.php b/module/file/view/export2csv.html.php
index a7b94ac557..51da9b6fce 100644
--- a/module/file/view/export2csv.html.php
+++ b/module/file/view/export2csv.html.php
@@ -12,14 +12,17 @@
 ?>
 <?php
 echo '"'. implode('","', $fields) . '"' . "\n";
-foreach($rows as $row)
+if($rows)
 {
-    echo '"';
-    foreach($fields as $fieldName => $fieldLabel)
+    foreach($rows as $row)
     {
-        isset($row->$fieldName) ? print(str_replace(array('"', '&nbsp;'), array('“', ' '), htmlspecialchars_decode(strip_tags($row->$fieldName, '<img>')))) : print('');
-        echo '","';
+        echo '"';
+        foreach($fields as $fieldName => $fieldLabel)
+        {
+            isset($row->$fieldName) ? print(str_replace(array('"', '&nbsp;'), array('“', ' '), htmlspecialchars_decode(strip_tags($row->$fieldName, '<img>')))) : print('');
+            echo '","';
+        }
+        echo '"' . "\n";
     }
-    echo '"' . "\n";
 }
 if($this->post->kind == 'task' && $config->vision != 'lite') echo $this->lang->file->childTaskTips;
diff --git a/module/port/view/header.html.php b/module/port/view/header.html.php
index 2b3bbc2b16..53b16bf31c 100644
--- a/module/port/view/header.html.php
+++ b/module/port/view/header.html.php
@@ -24,7 +24,7 @@ thead > tr > th{width:150px;}
 .c-id{width:50px}
 .c-team {width:100px; padding:0px 0px 8px 0px !important;}
 .c-estimate-1 {width:50px;padding:0px 0px 8px 8px !important;}
-.load-indicator{width: 100px; height: 500px;}
+#showData .load-indicator{width: 100px; height: 500px;}
 </style>
 <?php if(!empty($suhosinInfo)):?>
 <div class='alert alert-info'><?php echo $suhosinInfo?></div>