Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
integration
prechecker
Commits
39377f80
Commit
39377f80
authored
Dec 12, 2017
by
Damyon Wiese
Browse files
Merge branch 'MDL-44667-master' of
https://github.com/snake/moodle
parents
740a81ee
3112c220
Changes
5
Hide whitespace changes
Inline
Side-by-side
enrol/imsenterprise/tests/imsenterprise_test.php
View file @
39377f80
...
...
@@ -206,7 +206,7 @@ class enrol_imsenterprise_testcase extends advanced_testcase {
$this
->
set_xml_file
(
array
(
$imsuser
));
$this
->
imsplugin
->
cron
();
$this
->
assertEquals
(
1
,
$DB
->
get_field
(
'user'
,
'deleted'
,
array
(
'id'
=>
$user
->
id
),
'*'
,
MUST_EXIST
));
$this
->
assertEquals
(
1
,
$DB
->
get_field
(
'user'
,
'deleted'
,
array
(
'id'
=>
$user
->
id
),
MUST_EXIST
));
}
/**
...
...
@@ -227,7 +227,7 @@ class enrol_imsenterprise_testcase extends advanced_testcase {
$this
->
set_xml_file
(
array
(
$imsuser
));
$this
->
imsplugin
->
cron
();
$this
->
assertEquals
(
0
,
$DB
->
get_field
(
'user'
,
'deleted'
,
array
(
'id'
=>
$user
->
id
),
'*'
,
MUST_EXIST
));
$this
->
assertEquals
(
0
,
$DB
->
get_field
(
'user'
,
'deleted'
,
array
(
'id'
=>
$user
->
id
),
MUST_EXIST
));
}
/**
...
...
mod/assign/submission/file/locallib.php
View file @
39377f80
...
...
@@ -260,7 +260,7 @@ class assign_submission_file extends assign_submission_plugin {
$groupid
=
0
;
// Get the group name as other fields are not transcribed in the logs and this information is important.
if
(
empty
(
$submission
->
userid
)
&&
!
empty
(
$submission
->
groupid
))
{
$groupname
=
$DB
->
get_field
(
'groups'
,
'name'
,
array
(
'id'
=>
$submission
->
groupid
),
'*'
,
MUST_EXIST
);
$groupname
=
$DB
->
get_field
(
'groups'
,
'name'
,
array
(
'id'
=>
$submission
->
groupid
),
MUST_EXIST
);
$groupid
=
$submission
->
groupid
;
}
else
{
$params
[
'relateduserid'
]
=
$submission
->
userid
;
...
...
mod/assign/submission/onlinetext/locallib.php
View file @
39377f80
...
...
@@ -239,7 +239,7 @@ class assign_submission_onlinetext extends assign_submission_plugin {
$groupid
=
0
;
// Get the group name as other fields are not transcribed in the logs and this information is important.
if
(
empty
(
$submission
->
userid
)
&&
!
empty
(
$submission
->
groupid
))
{
$groupname
=
$DB
->
get_field
(
'groups'
,
'name'
,
array
(
'id'
=>
$submission
->
groupid
),
'*'
,
MUST_EXIST
);
$groupname
=
$DB
->
get_field
(
'groups'
,
'name'
,
array
(
'id'
=>
$submission
->
groupid
),
MUST_EXIST
);
$groupid
=
$submission
->
groupid
;
}
else
{
$params
[
'relateduserid'
]
=
$submission
->
userid
;
...
...
question/type/multianswer/questiontype.php
View file @
39377f80
...
...
@@ -46,7 +46,7 @@ class qtype_multianswer extends question_type {
// Get relevant data indexed by positionkey from the multianswers table.
$sequence
=
$DB
->
get_field
(
'question_multianswer'
,
'sequence'
,
array
(
'question'
=>
$question
->
id
),
'*'
,
MUST_EXIST
);
array
(
'question'
=>
$question
->
id
),
MUST_EXIST
);
$wrappedquestions
=
$DB
->
get_records_list
(
'question'
,
'id'
,
explode
(
','
,
$sequence
),
'id ASC'
);
...
...
search/tests/behat/behat_search.php
View file @
39377f80
...
...
@@ -96,7 +96,7 @@ class behat_search extends behat_base {
// Find the specified activity.
$idnumber
=
$input
[
'idnumber'
];
$cmid
=
$DB
->
get_field
(
'course_modules'
,
'id'
,
[
'idnumber'
=>
$idnumber
],
'*'
,
IGNORE_MISSING
);
$cmid
=
$DB
->
get_field
(
'course_modules'
,
'id'
,
[
'idnumber'
=>
$idnumber
],
IGNORE_MISSING
);
if
(
!
$cmid
)
{
throw
new
Exception
(
'Cannot find activity with idnumber: '
.
$idnumber
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment