Merge branch 'MDL-57274-master' of https://github.com/snake/moodle

2017-02-20 09:07:18 +01:00
parent 6b9d6d2eab a448a38b1d
commit 49b8fa7fce
1 changed files with 6 additions and 0 deletions
@@ -235,6 +235,9 @@ class curl_security_helper extends curl_security_helper_base {
     */
    protected function get_whitelisted_ports() {
        global $CFG;
+        if (!isset($CFG->curlsecurityallowedport)) {
+            return [];
+        }
        return array_filter(explode("\n", $CFG->curlsecurityallowedport), function($entry) {
            return !empty($entry);
        });
@@ -247,6 +250,9 @@ class curl_security_helper extends curl_security_helper_base {
     */
    protected function get_blacklisted_hosts() {
        global $CFG;
+        if (!isset($CFG->curlsecurityblockedhosts)) {
+            return [];
+        }
        return array_filter(array_map('trim', explode("\n", $CFG->curlsecurityblockedhosts)), function($entry) {
            return !empty($entry);
        });