Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -132,7 +132,6 @@ class TaskCenterRecord extends Model
|
|||||||
$inviteAchievement = DatabaseRoute::getDb('invite_achievement', $target_user_id)
|
$inviteAchievement = DatabaseRoute::getDb('invite_achievement', $target_user_id)
|
||||||
->where('target_user_id', $user_id)
|
->where('target_user_id', $user_id)
|
||||||
->find();
|
->find();
|
||||||
|
|
||||||
if($inviteAchievement && !empty($inviteAchievement['tasks'])) {
|
if($inviteAchievement && !empty($inviteAchievement['tasks'])) {
|
||||||
$splitTasks = explode(',', $inviteAchievement['tasks']);
|
$splitTasks = explode(',', $inviteAchievement['tasks']);
|
||||||
$isOver = false;
|
$isOver = false;
|
||||||
|
|||||||
@@ -15,6 +15,5 @@ error_reporting(E_ALL);
|
|||||||
$runtimeProcessPath = __DIR__ . '/../runtime/windows';
|
$runtimeProcessPath = __DIR__ . '/../runtime/windows';
|
||||||
$processFiles = glob($runtimeProcessPath . '/start_*.php');
|
$processFiles = glob($runtimeProcessPath . '/start_*.php');
|
||||||
App::loadAllConfig(['route']);
|
App::loadAllConfig(['route']);
|
||||||
|
|
||||||
App::run();
|
App::run();
|
||||||
?>
|
?>
|
||||||
|
|||||||
Reference in New Issue
Block a user