moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-72262-39' of git://github.com/ilyatregubov/moodle into MOODLE_39_STABLE

Browse source
This commit is contained in:
Víctor Déniz 2021-08-04 12:44:23 +01:00
commit 7bd088e443
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/behat/classes/behat_generator_base.php
View file

@ -549,7 +549,7 @@ abstract class behat_generator_base {
$cmtable = new \core\dml\table('course_modules', 'cm', 'cm'); $cmtable = new \core\dml\table('course_modules', 'cm', 'cm');
$cmfrom = $cmtable->get_from_sql(); $cmfrom = $cmtable->get_from_sql();
$acttable = new \core\dml\table($activity, 'act', 'act'); $acttable = new \core\dml\table($activity, 'a', 'a');
$actselect = $acttable->get_field_select(); $actselect = $acttable->get_field_select();
$actfrom = $acttable->get_from_sql(); $actfrom = $acttable->get_from_sql();
@ -558,8 +558,8 @@ abstract class behat_generator_base {
FROM {$cmfrom} FROM {$cmfrom}
INNER JOIN {$coursefrom} ON c.id = cm.course INNER JOIN {$coursefrom} ON c.id = cm.course
INNER JOIN {modules} m ON m.id = cm.module AND m.name = :modname INNER JOIN {modules} m ON m.id = cm.module AND m.name = :modname
INNER JOIN {$actfrom} ON cm.instance = act.id INNER JOIN {$actfrom} ON cm.instance = a.id
WHERE cm.idnumber = :idnumber OR act.name = :name WHERE cm.idnumber = :idnumber OR a.name = :name
EOF; EOF;
$result = $DB->get_record_sql($sql, [ $result = $DB->get_record_sql($sql, [

6
lib/behat/classes/behat_session_trait.php
View file

@ -1546,7 +1546,7 @@ EOF;
$cmtable = new \core\dml\table('course_modules', 'cm', 'cm'); $cmtable = new \core\dml\table('course_modules', 'cm', 'cm');
$cmfrom = $cmtable->get_from_sql(); $cmfrom = $cmtable->get_from_sql();
$acttable = new \core\dml\table($activity, 'act', 'act'); $acttable = new \core\dml\table($activity, 'a', 'a');
$actselect = $acttable->get_field_select(); $actselect = $acttable->get_field_select();
$actfrom = $acttable->get_from_sql(); $actfrom = $acttable->get_from_sql();
@ -1555,8 +1555,8 @@ EOF;
FROM {$cmfrom} FROM {$cmfrom}
INNER JOIN {$coursefrom} ON c.id = cm.course INNER JOIN {$coursefrom} ON c.id = cm.course
INNER JOIN {modules} m ON m.id = cm.module AND m.name = :modname INNER JOIN {modules} m ON m.id = cm.module AND m.name = :modname
INNER JOIN {$actfrom} ON cm.instance = act.id INNER JOIN {$actfrom} ON cm.instance = a.id
WHERE cm.idnumber = :idnumber OR act.name = :name WHERE cm.idnumber = :idnumber OR a.name = :name
EOF; EOF;
$result = $DB->get_record_sql($sql, [ $result = $DB->get_record_sql($sql, [