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

Merge branch 'MDL-49244-master' of git://github.com/jleyva/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2016-07-05 20:16:44 +02:00
commit e51f7a6a20
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
course/externallib.php
View file

@ -1552,7 +1552,7 @@ class core_course_external extends external_api {
} }
if (isset($value)) { if (isset($value)) {
$conditions[$key] = $crit['value']; $conditions[$key] = $value;
$wheres[] = $key . " = :" . $key; $wheres[] = $key . " = :" . $key;
} }
} }

10
course/tests/externallib_test.php
View file

@ -234,6 +234,16 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
$this->assertEquals(1, count($categories)); $this->assertEquals(1, count($categories));
// Same query, but forcing a parameters clean.
$categories = core_course_external::get_categories(array(
array('key' => 'id', 'value' => "$category1->id"),
array('key' => 'idnumber', 'value' => $category1->idnumber),
array('key' => 'name', 'value' => $category1->name . "<br/>"),
array('key' => 'visible', 'value' => '1')), 0);
$categories = external_api::clean_returnvalue(core_course_external::get_categories_returns(), $categories);
$this->assertEquals(1, count($categories));
// Retrieve categories from parent. // Retrieve categories from parent.
$categories = core_course_external::get_categories(array( $categories = core_course_external::get_categories(array(
array('key' => 'parent', 'value' => $category3->id)), 1); array('key' => 'parent', 'value' => $category3->id)), 1);