diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index 4e8da9d744..15dde23519 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -446,19 +446,19 @@ class upgrade extends control
}
/**
+ * 获取修复冲突的记录。
* Ajax get fix consistency logs.
*
* @param int $offset
* @access public
* @return void
*/
- public function ajaxGetFixLogs($offset = 0)
+ public function ajaxGetFixLogs(int $offset = 0)
{
$logFile = $this->upgrade->getConsistencyLogFile();
$lines = !file_exists($logFile) ? array() : file($logFile);
-
- $log = array_slice($lines, $offset);
- $finished = ($log and end($log) == 'Finished') ? true : false;
+ $log = array_slice($lines, $offset);
+ $finished = ($log && end($log) == 'Finished') ? true : false;
return print(json_encode(array('log' => implode("
", $log) . "
", 'finished' => $finished, 'offset' => count($lines))));
}