Merge branch 'MDL-69562_master' of https://github.com/dvdcastro/moodle

2021-02-16 22:32:56 +01:00
parent a32ed14f03 15527bf4a8
commit 166add5c8c
2 changed files with 44 additions and 1 deletions
@@ -9333,7 +9333,7 @@ function remoteip_in_list($list) {
 function getremoteaddr($default='0.0.0.0') {
    global $CFG;

-    if (empty($CFG->getremoteaddrconf)) {
+    if (!isset($CFG->getremoteaddrconf)) {
        // This will happen, for example, before just after the upgrade, as the
        // user is redirected to the admin screen.
        $variablestoskip = GETREMOTEADDR_SKIP_DEFAULT;