Skip to content

Commit 187fcca

Browse files
committed
issue #471: revert exception and add some comments
1 parent bd4bbc3 commit 187fcca

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

classes/local/store/object_file_system.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,14 +1003,15 @@ public function cron() {
10031003
}
10041004

10051005
/**
1006-
* Object fs doesn't use trashdir.
1006+
* Object fs doens't use trashdir - trigger exception.
10071007
*
10081008
* @param string $contenthash The content hash
10091009
* @return string The full path to the trash directory
10101010
*/
10111011
protected function get_trash_fulldir_from_hash($contenthash) {
1012-
debugging('Objectfs does not implement a trashdir.');
1013-
return '';
1012+
// Nothing should be asking objectstorage for it's trashdir path - it doesn't exist.
1013+
// However let's throw an exception unless something else comes up that suggests we need to change it.
1014+
throw new \coding_exception('Objectfs does not implement a trashdir.');
10141015
}
10151016

10161017
/**
@@ -1020,6 +1021,8 @@ protected function get_trash_fulldir_from_hash($contenthash) {
10201021
* @return string The full path to the trash file
10211022
*/
10221023
protected function get_trash_fullpath_from_hash($contenthash) {
1024+
// Method get_trash_fullpath_from_hash called by core filelib functions,
1025+
// and we can't easily change those across stables. So add debugging here.
10231026
debugging('Objectfs does not implement a trashdir.');
10241027
return '';
10251028
}

0 commit comments

Comments
 (0)