L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-61836-master-order' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2018-04-20 03:03:34 +02:00
parent 11f07048f4 7072009431
commit 1bcbbe3582
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blog/classes/privacy/provider.php
+1 -1
View File
@@ -212,7 +212,7 @@ class provider implements
// Loop over each blog entry in context.
$sql = "userid = :userid AND module IN (:blog, :blogext) AND id $insql";
$params = array_merge($inparams, ['userid' => $contextuserid, 'blog' => 'blog', 'blogext' => 'blog_external']);
$recordset = $DB->get_recordset_select('post', $sql, $params);
$recordset = $DB->get_recordset_select('post', $sql, $params, 'id');
foreach ($recordset as $record) {
$subject = format_string($record->subject);
blog/tests/privacy_test.php
+11 -2
View File
@@ -594,8 +594,17 @@ class core_blog_privacy_testcase extends provider_testcase {
$comments = $writer->get_data($commentpath);
$this->assertCount(2, $comments->comments);
$this->assertEquals('Hello, it\'s me!', strip_tags($comments->comments[0]->content));
$this->assertEquals('I was wondering if after', strip_tags($comments->comments[1]->content));
$c0 = strip_tags($comments->comments[0]->content);
$c1 = strip_tags($comments->comments[1]->content);
$expectedcomments = [
'Hello, it\'s me!',
'I was wondering if after',
];
$this->assertNotFalse(array_search($c0, $expectedcomments));
$this->assertNotFalse(array_search($c1, $expectedcomments));
$this->assertNotEquals($c0, $c1);
} else {
$tagdata = $writer->get_related_data($path, 'tags');