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

Merge branch 'MDL-50892-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2015-09-15 23:12:22 +02:00
commit 4deecee44f
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
course/recent.php
View File

@ -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;

2
course/rest.php
View File

@ -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();

2
grade/grading/lib.php
View File

@ -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);

2
lib/classes/event/calendar_event_created.php
View File

@ -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'])) {

2
lib/classes/event/calendar_event_deleted.php
View File

@ -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'])) {

2
lib/classes/event/calendar_event_updated.php
View File

@ -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'])) {

2
lib/grade/grade_item.php
View File

@ -1304,7 +1304,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);

2
lib/modinfolib.php
View File

@ -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;
}