1
0
mirror of https://github.com/moodle/moodle.git synced 2025-02-17 22:35:24 +01:00

Merge branch 'MDL-71741-master' of git://github.com/HuongNV13/moodle

This commit is contained in:
Andrew Nicols 2021-06-03 11:51:12 +08:00
commit 95fed58b5e
2 changed files with 19 additions and 6 deletions

@ -235,6 +235,9 @@ class flickr_client extends oauth_helper {
$response = $this->http->post(self::UPLOAD_ROOT, $params); $response = $this->http->post(self::UPLOAD_ROOT, $params);
// Reset http header and options to prepare for the next request.
$this->reset_state();
if ($response) { if ($response) {
$xml = simplexml_load_string($response); $xml = simplexml_load_string($response);
@ -254,4 +257,14 @@ class flickr_client extends oauth_helper {
throw new moodle_exception('flickr_upload_error', 'core_error', '', null, $response); throw new moodle_exception('flickr_upload_error', 'core_error', '', null, $response);
} }
} }
/**
* Resets curl state.
*
* @return void
*/
public function reset_state(): void {
$this->http->cleanopt();
$this->http->resetHeader();
}
} }

@ -1028,15 +1028,15 @@ function portfolio_filesize_info() {
function portfolio_expected_time_db($recordcount) { function portfolio_expected_time_db($recordcount) {
global $CFG; global $CFG;
if (empty($CFG->portfolio_moderate_dbsize_threshold)) { if (empty($CFG->portfolio_moderate_db_threshold)) {
set_config('portfolio_moderate_dbsize_threshold', 10); set_config('portfolio_moderate_db_threshold', 20);
} }
if (empty($CFG->portfolio_high_dbsize_threshold)) { if (empty($CFG->portfolio_high_db_threshold)) {
set_config('portfolio_high_dbsize_threshold', 50); set_config('portfolio_high_db_threshold', 50);
} }
if ($recordcount < $CFG->portfolio_moderate_dbsize_threshold) { if ($recordcount < $CFG->portfolio_moderate_db_threshold) {
return PORTFOLIO_TIME_LOW; return PORTFOLIO_TIME_LOW;
} else if ($recordcount < $CFG->portfolio_high_dbsize_threshold) { } else if ($recordcount < $CFG->portfolio_high_db_threshold) {
return PORTFOLIO_TIME_MODERATE; return PORTFOLIO_TIME_MODERATE;
} }
return PORTFOLIO_TIME_HIGH; return PORTFOLIO_TIME_HIGH;