mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
MDL-16780 Merging from MOODLE_19_STABLE
This commit is contained in:
parent
18a9406799
commit
1e074660da
14 changed files with 1970 additions and 76 deletions
|
@ -10,7 +10,7 @@
|
|||
*/
|
||||
require_once('../config.php');
|
||||
require_once('lib.php');
|
||||
require_once($CFG->libdir.'/json/JSON.php');
|
||||
require_once($CFG->libdir.'/pear/HTML/AJAX/JSON.php');
|
||||
|
||||
require_js(array('yui_yahoo', 'yui_dom', 'yui_utilities', 'yui_connection'));
|
||||
require_js('group/clientlib.js');
|
||||
|
@ -58,8 +58,7 @@ switch ($action) {
|
|||
$roles[]=$shortroledata;
|
||||
}
|
||||
}
|
||||
$json = new Services_JSON();
|
||||
echo $json->encode($roles);
|
||||
echo json_encode($roles);
|
||||
die; // Client side JavaScript takes it from here.
|
||||
|
||||
case 'deletegroup':
|
||||
|
@ -205,11 +204,11 @@ if ($sel_groupid) {
|
|||
echo '<option value="'.$member->id.'">'.fullname($member, true).'</option>';
|
||||
$atleastonemember = true;
|
||||
}
|
||||
echo '</optgroup>';
|
||||
echo '</optgroup>';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!$atleastonemember) {
|
||||
// Print an empty option to avoid the XHTML error of having an empty select element
|
||||
echo '<option> </option>';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue