diff --git a/repository/googledocs/lib.php b/repository/googledocs/lib.php index 402aff31279..3520254d96b 100644 --- a/repository/googledocs/lib.php +++ b/repository/googledocs/lib.php @@ -72,6 +72,10 @@ class repository_googledocs extends repository { } catch (dml_missing_record_exception $e) { $this->disabled = true; } + + if ($this->issuer && !$this->issuer->get('enabled')) { + $this->disabled = true; + } } /** @@ -863,7 +867,7 @@ class repository_googledocs extends repository { // Check this issuer is enabled. - if (!$this->issuer->get('enabled')) { + if ($this->disabled) { throw new repository_exception('cannotdownload', 'repository'); } @@ -956,7 +960,7 @@ class repository_googledocs extends repository { * @param int $filestatus */ public function get_reference_details($reference, $filestatus = 0) { - if (!$this->issuer->get('enabled')) { + if ($this->disabled) { throw new repository_exception('cannotdownload', 'repository'); } if (empty($reference)) { diff --git a/repository/skydrive/lib.php b/repository/skydrive/lib.php index a731a023796..45a4b6f334b 100644 --- a/repository/skydrive/lib.php +++ b/repository/skydrive/lib.php @@ -68,6 +68,10 @@ class repository_skydrive extends repository { } catch (dml_missing_record_exception $e) { $this->disabled = true; } + + if ($this->issuer && !$this->issuer->get('enabled')) { + $this->disabled = true; + } } /** @@ -202,7 +206,7 @@ class repository_skydrive extends repository { $path = $this->build_node_path('root', get_string('pluginname', 'repository_skydrive')); } - if (!$this->issuer->get('enabled')) { + if ($this->disabled) { // Empty list of files for disabled repository. return ['dynload' => false, 'list' => [], 'nologin' => true]; } @@ -401,7 +405,7 @@ class repository_skydrive extends repository { public function get_file($reference, $filename = '') { global $CFG; - if (!$this->issuer->get('enabled')) { + if ($this->disabled) { throw new repository_exception('cannotdownload', 'repository'); } @@ -518,7 +522,7 @@ class repository_skydrive extends repository { * @param array $options additional options affecting the file serving */ public function send_file($storedfile, $lifetime=null , $filter=0, $forcedownload=false, array $options = null) { - if (!$this->issuer->get('enabled')) { + if ($this->disabled) { throw new repository_exception('cannotdownload', 'repository'); }