From bc91a790bec37094587aeb85a1cb4afa62d5185d Mon Sep 17 00:00:00 2001 From: chaideqing Date: Wed, 24 May 2023 11:21:49 +0800 Subject: [PATCH] * Fix variable naming from to . --- module/gitlab/model.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/gitlab/model.php b/module/gitlab/model.php index 9c0e529751..9005fb7141 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -502,7 +502,7 @@ class gitlabModel extends model $gitlab = $this->loadModel('gitlab')->getByID($gitlabID); if(!$gitlab) return ''; $url = rtrim($gitlab->url, '/') . "/api/v4/todos?project_id=$projectID&type=MergeRequest&state=pending&private_token={$gitlab->token}&sudo={$sudo}"; - return json_decode(commonModel::http($url, $data = null, $optionsi = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30, $httpCode = false, $log = false)); + return json_decode(commonModel::http($url, $data = null, $options = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30, $httpCode = false, $log = false)); } /** @@ -749,7 +749,7 @@ class gitlabModel extends model $allResults = array(); for($page = 1; true; $page++) { - $results = json_decode(commonModel::http($url . "&simple={$simple}&page={$page}&per_page=100", $data = null, $optionsi = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30, $httpCode = false, $log = false)); + $results = json_decode(commonModel::http($url . "&simple={$simple}&page={$page}&per_page=100", $data = null, $options = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30, $httpCode = false, $log = false)); if(!is_array($results)) break; if(!empty($results)) $allResults = array_merge($allResults, $results); if(count($results) < 100) break; @@ -1031,7 +1031,7 @@ class gitlabModel extends model if(isset($this->projects[$gitlabID][$projectID])) return $this->projects[$gitlabID][$projectID]; $url = sprintf($this->getApiRoot($gitlabID, $useUser), "/projects/$projectID"); - $this->projects[$gitlabID][$projectID] = json_decode(commonModel::http($url, $data = null, $optionsi = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30, $httpCode = false, $log = false)); + $this->projects[$gitlabID][$projectID] = json_decode(commonModel::http($url, $data = null, $options = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30, $httpCode = false, $log = false)); return $this->projects[$gitlabID][$projectID]; }