Merge branch 'MDL-55027_master' of git://github.com/markn86/moodle

2016-06-30 09:24:56 +01:00
parent 5fd469e921 a802be7e39
commit 941b725693
1 changed files with 4 additions and 2 deletions
@@ -202,8 +202,10 @@ class helper {
            'connecttimeout' => 5
        );

-        if (!$iconfiles = $fs->create_file_from_url($filerecord, $url, $urlparams)) {
-            return self::PROFILE_IMAGE_UPDATE_FAILED;
+        try {
+            $fs->create_file_from_url($filerecord, $url, $urlparams);
+        } catch (\file_exception $e) {
+            return get_string($e->errorcode, $e->module, $e->a);
        }

        $iconfile = $fs->get_area_files($context->id, 'user', 'newicon', false, 'itemid', false);