Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'MDL-33682_22' of git://github.com/timhunt/moodle into M…

…OODLE_22_STABLE
  • Loading branch information...
commit 0f63503db034ec01f437050d002a798a0fbd4332 2 parents 897329c + de50c77
@stronk7 stronk7 authored
View
2  backup/backup.php
@@ -62,7 +62,7 @@
case backup::TYPE_1SECTION :
$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
require_capability('moodle/backup:backupsection', $coursecontext);
- if (!empty($section->name)) {
+ if ((string)$section->name !== '') {
$sectionname = format_string($section->name, true, array('context' => $coursecontext));
$heading = get_string('backupsection', 'backup', $sectionname);
$PAGE->navbar->add($sectionname);
View
2  backup/moodle2/restore_stepslib.php
@@ -1027,7 +1027,7 @@ public function process_section($data) {
// Section exists, update non-empty information
} else {
$section->id = $secrec->id;
- if (empty($secrec->name)) {
+ if ((string)$secrec->name === '') {
$section->name = $data->name;
}
if (empty($secrec->summary)) {
View
2  backup/util/factories/backup_factory.class.php
@@ -139,7 +139,7 @@ public static function get_backup_section_task($format, $sectionid) {
throw new backup_task_exception('section_task_section_not_found', $sectionid);
}
- return new backup_section_task(empty($section->name) ? $section->section : $section->name, $sectionid);
+ return new backup_section_task((string)$section->name !== '' ? $section->section : $section->name, $sectionid);
}
/**
View
2  backup/util/ui/backup_ui_setting.class.php
@@ -129,7 +129,7 @@ public function get_static_value() {
* @param string $label
*/
public function set_label($label) {
- if (empty($label) || $label !== clean_param($label, PARAM_TEXT)) {
+ if ((string)$label === '' || $label !== clean_param($label, PARAM_TEXT)) {
throw new base_setting_ui_exception('setting_invalid_ui_label');
}
$this->label = $label;
Please sign in to comment.
Something went wrong with that request. Please try again.