mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-26 00:31:35 +02:00
Code Issues Projects Releases Wiki Activity

MDL-20534 lti: B14 - whitespace and comment fixes

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-11-18 16:05:22 +01:00
parent 3a2927081c
commit 194f2c60ef
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mod/lti/db/upgrade.php
View File

@@ -65,19 +65,19 @@ function xmldb_lti_upgrade($oldversion) {
$dbman = $DB->get_manager(); $dbman = $DB->get_manager();
if($oldversion < 2011111600){ if($oldversion < 2011111600){
//Rename showdescription to showdescriptionlaunch to not conflict with setting from core Moodle // Rename showdescription to showdescriptionlaunch to not conflict with setting from core Moodle
//Rename showtitle as well to be consistent // Rename showtitle as well to be consistent
$table = new xmldb_table('lti'); $table = new xmldb_table('lti');
$field = new xmldb_field('showtitle', XMLDB_TYPE_INTEGER, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'debuglaunch'); $field = new xmldb_field('showtitle', XMLDB_TYPE_INTEGER, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'debuglaunch');
$dbman->rename_field($table, $field, 'showtitlelaunch'); $dbman->rename_field($table, $field, 'showtitlelaunch');
$field = new xmldb_field('showdescription', XMLDB_TYPE_INTEGER, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'showtitlelaunch'); $field = new xmldb_field('showdescription', XMLDB_TYPE_INTEGER, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'showtitlelaunch');
$dbman->rename_field($table, $field, 'showdescriptionlaunch'); $dbman->rename_field($table, $field, 'showdescriptionlaunch');
upgrade_mod_savepoint(true, 2011111600, 'lti'); upgrade_mod_savepoint(true, 2011111600, 'lti');
} }
return true; return true;
} }

4
mod/lti/lib.php
View File

@@ -189,14 +189,14 @@ function lti_get_coursemodule_info($coursemodule) {
} else if (!empty($lti->icon)) { } else if (!empty($lti->icon)) {
$info->iconurl = new moodle_url($lti->icon); $info->iconurl = new moodle_url($lti->icon);
} }
if ($coursemodule->showdescription) { if ($coursemodule->showdescription) {
// Convert intro to html. Do not filter cached version, filters run at display time. // Convert intro to html. Do not filter cached version, filters run at display time.
$info->content = format_module_intro('lti', $lti, $coursemodule->id, false); $info->content = format_module_intro('lti', $lti, $coursemodule->id, false);
} }
$info->name = $lti->name; $info->name = $lti->name;
return $info; return $info;
} }

6
mod/lti/mod_form.php
View File

@@ -69,14 +69,14 @@ class mod_lti_mod_form extends moodleform_mod {
// Adding the optional "intro" and "introformat" pair of fields // Adding the optional "intro" and "introformat" pair of fields
$this->add_intro_editor(false, get_string('basicltiintro', 'lti')); $this->add_intro_editor(false, get_string('basicltiintro', 'lti'));
$mform->setAdvanced('introeditor'); $mform->setAdvanced('introeditor');
//Display the label to the right of the checkbox so it looks better & matches rest of the form // Display the label to the right of the checkbox so it looks better & matches rest of the form
$coursedesc = $mform->getElement('showdescription'); $coursedesc = $mform->getElement('showdescription');
if(!empty($coursedesc)){ if(!empty($coursedesc)){
$coursedesc->setText(' ' . $coursedesc->getLabel()); $coursedesc->setText(' ' . $coursedesc->getLabel());
$coursedesc->setLabel('&nbsp'); $coursedesc->setLabel('&nbsp');
} }
$mform->setAdvanced('showdescription'); $mform->setAdvanced('showdescription');
$mform->addElement('checkbox', 'showtitlelaunch', '&nbsp;', ' ' . get_string('display_name', 'lti')); $mform->addElement('checkbox', 'showtitlelaunch', '&nbsp;', ' ' . get_string('display_name', 'lti'));