mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master_MDL-32506' of git://github.com/danmarsden/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-09-17 21:11:26 +02:00
commit e79ca991fb
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mod/scorm/lang/en/scorm.php
View File

@ -280,7 +280,6 @@ $string['report'] = 'Report';
$string['reports'] = 'Reports';
$string['reportcountallattempts'] = '{$a->nbattempts} attempts for {$a->nbusers} users, out of {$a->nbresults} results';
$string['reportcountattempts'] = '{$a->nbresults} results ({$a->nbusers} users)';
$string['resizable'] = 'Allow the window to be resized';
$string['response'] = 'Response';
$string['result'] = 'Result';
$string['results'] = 'Results';

16
mod/scorm/locallib.php
View File

@ -71,16 +71,14 @@ class scorm_package_file_info extends file_info_stored {
* @return array an array of popup options as the key and their defaults as the value
*/
function scorm_get_popup_options_array() {
global $CFG;
$cfg_scorm = get_config('scorm');
$cfgscorm = get_config('scorm');
return array('resizable'=> isset($cfg_scorm->resizable) ? $cfg_scorm->resizable : 0,
'scrollbars'=> isset($cfg_scorm->scrollbars) ? $cfg_scorm->scrollbars : 0,
'directories'=> isset($cfg_scorm->directories) ? $cfg_scorm->directories : 0,
'location'=> isset($cfg_scorm->location) ? $cfg_scorm->location : 0,
'menubar'=> isset($cfg_scorm->menubar) ? $cfg_scorm->menubar : 0,
'toolbar'=> isset($cfg_scorm->toolbar) ? $cfg_scorm->toolbar : 0,
'status'=> isset($cfg_scorm->status) ? $cfg_scorm->status : 0);
return array('scrollbars'=> isset($cfgscorm->scrollbars) ? $cfgscorm->scrollbars : 0,
'directories'=> isset($cfgscorm->directories) ? $cfgscorm->directories : 0,
'location'=> isset($cfgscorm->location) ? $cfgscorm->location : 0,
'menubar'=> isset($cfgscorm->menubar) ? $cfgscorm->menubar : 0,
'toolbar'=> isset($cfgscorm->toolbar) ? $cfgscorm->toolbar : 0,
'status'=> isset($cfgscorm->status) ? $cfgscorm->status : 0);
}
/**