Commit 5d4bccd7 authored by Eloy Lafuente (stronk7)'s avatar Eloy Lafuente (stronk7)
Browse files

Merge branch 'MDL-50892-28' of git://github.com/marinaglancy/moodle into MOODLE_28_STABLE

parents 2648522e 355e943c
......@@ -212,7 +212,7 @@ if (!empty($activities)) {
echo $OUTPUT->spacer(array('height'=>30, 'br'=>true)); // should be done with CSS instead
}
echo $OUTPUT->box_start();
if (!empty($activity->name)) {
if (strval($activity->name) !== '') {
echo html_writer::tag('h2', $activity->name);
}
$inbox = true;
......
......@@ -173,7 +173,7 @@ switch($requestmethod) {
$module->name = clean_param($title, PARAM_CLEANHTML);
}
if (!empty($module->name)) {
if (strval($module->name) !== '') {
$DB->update_record($cm->modname, $module);
$cm->name = $module->name;
\core\event\course_module_updated::create_from_cm($cm, $modcontext)->trigger();
......
......@@ -185,7 +185,7 @@ class grading_manager {
} else if ($this->get_context()->contextlevel >= CONTEXT_COURSE) {
list($context, $course, $cm) = get_context_info_array($this->get_context()->id);
if (!empty($cm->name)) {
if (strval($cm->name) !== '') {
$title = $cm->name;
} else {
debugging('Gradable areas are currently supported at the course module level only', DEBUG_DEVELOPER);
......
......@@ -104,7 +104,7 @@ class calendar_event_created extends base {
if (!isset($this->other['repeatid'])) {
throw new \coding_exception('The \'repeatid\' value must be set in other.');
}
if (empty($this->other['name'])) {
if (!isset($this->other['name'])) {
throw new \coding_exception('The \'name\' value must be set in other.');
}
if (!isset($this->other['timestart'])) {
......
......@@ -85,7 +85,7 @@ class calendar_event_deleted extends base {
if (!isset($this->other['repeatid'])) {
throw new \coding_exception('The \'repeatid\' value must be set in other.');
}
if (empty($this->other['name'])) {
if (!isset($this->other['name'])) {
throw new \coding_exception('The \'name\' value must be set in other.');
}
if (!isset($this->other['timestart'])) {
......
......@@ -103,7 +103,7 @@ class calendar_event_updated extends base {
if (!isset($this->other['repeatid'])) {
throw new \coding_exception('The \'repeatid\' value must be set in other.');
}
if (empty($this->other['name'])) {
if (!isset($this->other['name'])) {
throw new \coding_exception('The \'name\' value must be set in other.');
}
if (!isset($this->other['timestart'])) {
......
......@@ -1290,7 +1290,7 @@ class grade_item extends grade_object {
* @return string name
*/
public function get_name($fulltotal=false) {
if (!empty($this->itemname)) {
if (strval($this->itemname) !== '') {
// MDL-10557
return format_string($this->itemname);
......
......@@ -492,7 +492,7 @@ class course_modinfo {
// Loop through each piece of module data, constructing it
static $modexists = array();
foreach ($coursemodinfo->modinfo as $mod) {
if (empty($mod->name)) {
if (strval($mod->name) === '') {
// something is wrong here
continue;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment