mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-25 10:26:17 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-38632' of git://github.com/stronk7/moodle

Browse Source
This commit is contained in:
Aparup Banerjee 2013-03-27 13:07:10 +08:00
commit 8963212472
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/folder/lib.php
View File

@ -426,7 +426,7 @@ function folder_dndupload_handle($uploadinfo) {
function folder_get_coursemodule_info($cm) {
global $DB;
if (!($folder = $DB->get_record('folder', array('id' => $cm->instance),
'id, name, display, intro, introformat'))) {
'id, name, display, show_expanded, intro, introformat'))) {
return NULL;
}
$cminfo = new cached_cm_info();
@ -434,6 +434,7 @@ function folder_get_coursemodule_info($cm) {
if ($folder->display == FOLDER_DISPLAY_INLINE) {
// prepare folder object to store in customdata
$fdata = new stdClass();
$fdata->show_expanded = $folder->show_expanded;
if ($cm->showdescription && strlen(trim($folder->intro))) {
$fdata->intro = $folder->intro;
if ($folder->introformat != FORMAT_MOODLE) {