Merge branch 'MDL-58908-master' of git://github.com/damyon/moodle

2017-06-06 17:15:41 +08:00
parent 1be1d5e5cf 95e13556df
commit 1ff50be21f
1 changed files with 4 additions and 0 deletions
@@ -247,6 +247,10 @@ class auth extends \auth_plugin_base {
        if (!empty($user->picture)) {
            return false;
        }
+        if (!empty($CFG->enablegravatar)) {
+            return false;
+        }
+
        $picture = $this->get_static_user_picture();
        if (empty($picture)) {
            return false;