L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MOODLE_30_STABLE' into install_30_STABLE

Browse Source
This commit is contained in:
AMOS bot
2016-12-01 00:06:02 +08:00
parent 0ae9cfc1c2 8dfbc3a822
commit f2066cb88f
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/upgradelib.php
+6
View File
@@ -2453,6 +2453,12 @@ function upgrade_install_plugins(array $installable, $confirmed, $heading='', $c
*/
function check_libcurl_version(environment_results $result) {
if (!function_exists('curl_version')) {
$result->setInfo('cURL PHP extension is not installed');
$result->setStatus(false);
return $result;
}
// Supported version and version number.
$supportedversion = 0x071304;
$supportedversionstring = "7.19.4";
repository/dropbox/classes/legacy.php
+22
View File
@@ -651,4 +651,26 @@ class repository_dropbox_legacy extends repository {
} catch (moodle_exception $e) {}
}
}
/**
* Get dropbox options
* @param string $config
* @return mixed
*/
public function get_option($config = '') {
if ($config === 'dropbox_key') {
return trim(get_config('dropbox', 'dropbox_key'));
} else if ($config === 'dropbox_secret') {
return trim(get_config('dropbox', 'dropbox_secret'));
} else if ($config === 'dropbox_cachelimit') {
return $this->max_cache_bytes();
} else {
$options = parent::get_option();
$options['dropbox_key'] = trim(get_config('dropbox', 'dropbox_key'));
$options['dropbox_secret'] = trim(get_config('dropbox', 'dropbox_secret'));
$options['dropbox_cachelimit'] = $this->max_cache_bytes();
}
return $options;
}
}
version.php
+2 -2
View File
@@ -29,11 +29,11 @@
defined('MOODLE_INTERNAL') || die();
$version = 2015111607.01; // 20151116 = branching date YYYYMMDD - do not modify!
$version = 2015111607.02; // 20151116 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
$release = '3.0.7+ (Build: 20161125)'; // Human-friendly version name
$release = '3.0.7+ (Build: 20161129)'; // Human-friendly version name
$branch = '30'; // This version's branch.
$maturity = MATURITY_STABLE; // This version's maturity level.