mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 00:16:46 +02:00
Merge branch 'MDL-61407-master' of git://github.com/andrewnicols/moodle
This commit is contained in:
commit
209f6e1eda
123 changed files with 5000 additions and 33 deletions
|
@ -73,6 +73,8 @@ class content_writer implements \core_privacy\local\request\content_writer {
|
|||
|
||||
/**
|
||||
* Whether any data has been exported at all within the current context.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function has_any_data() {
|
||||
$hasdata = !empty($this->data->{$this->context->id});
|
||||
|
@ -96,6 +98,32 @@ class content_writer implements \core_privacy\local\request\content_writer {
|
|||
return $hasanydata;
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether any data has been exported for any context.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function has_any_data_in_any_context() {
|
||||
$checkfordata = function($location) {
|
||||
foreach ($location as $context => $data) {
|
||||
if (!empty($data)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
|
||||
$hasanydata = $checkfordata($this->data);
|
||||
$hasanydata = $hasanydata || $checkfordata($this->relateddata);
|
||||
$hasanydata = $hasanydata || $checkfordata($this->metadata);
|
||||
$hasanydata = $hasanydata || $checkfordata($this->files);
|
||||
$hasanydata = $hasanydata || $checkfordata($this->customfiles);
|
||||
$hasanydata = $hasanydata || $checkfordata($this->userprefs);
|
||||
|
||||
return $hasanydata;
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor for the content writer.
|
||||
*
|
||||
|
|
|
@ -40,6 +40,14 @@ use \core_privacy\local\request\writer;
|
|||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
class writer_test extends advanced_testcase {
|
||||
/**
|
||||
* Ensure that the writer is cleared away as appropriate after each
|
||||
* test.
|
||||
*/
|
||||
public function tearDown() {
|
||||
writer::reset();
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that calling with_context multiple times will return the same write instance.
|
||||
*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue