From 36136454b7b7df5b45220d0254e86bed8edec424 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Mon, 9 Sep 2013 20:52:23 +1200 Subject: [PATCH] MDL-32506 SCORM: remove obsolete setting. --- mod/scorm/lang/en/scorm.php | 1 - mod/scorm/locallib.php | 16 +++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/mod/scorm/lang/en/scorm.php b/mod/scorm/lang/en/scorm.php index 2cdee95df71..f39efdaa8fe 100644 --- a/mod/scorm/lang/en/scorm.php +++ b/mod/scorm/lang/en/scorm.php @@ -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'; diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php index 8287314c9ca..e888cab8a7f 100644 --- a/mod/scorm/locallib.php +++ b/mod/scorm/locallib.php @@ -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); } /**