Merge branch 'MDL-69143-39' of git://github.com/ferranrecio/moodle into MOODLE_39_STABLE

contentbank/classes/contenttype.php

@@ -28,7 +28,7 @@ use core\event\contentbank_content_created;
 use core\event\contentbank_content_deleted;
 use core\event\contentbank_content_viewed;
 use stored_file;
-use file_exception;
+use Exception;
 use moodle_url;
 
 /**
@@ -107,7 +107,7 @@ abstract class contenttype {
         $content = $this->create_content($record);
         try {
             $content->import_file($file);
-        } catch (file_exception $e) {
+        } catch (Exception $e) {
             $this->delete_content($content);
             throw $e;
         }

contentbank/tests/contenttype_test.php

@@ -28,7 +28,7 @@ namespace core_contentbank;
 use stdClass;
 use context_system;
 use context_user;
-use file_exception;
+use Exception;
 use contenttype_testable\contenttype as contenttype;
 /**
  * Test for content bank contenttype class.
@@ -283,7 +283,7 @@ class core_contenttype_contenttype_testcase extends \advanced_testcase {
         try {
             $content = $contenttype->upload_content($dummyfile);
             $this->assertTrue(false);
-        } catch (file_exception $e) {
+        } catch (Exception $e) {
             $this->assertTrue(true);
         }
         $this->assertEquals($cbcontents, $DB->count_records('contentbank_content'));