MDL-15304 fixed empty label names coming from restore; merged from MOODLE_19_STABLE

diff --git a/mod/label/lib.php b/mod/label/lib.php
index 3e1a8a086e9fd5f2c29b865a21adc77bfd74bf3d..bbcc4f1e8a7865455be0f346e45c643d219a2cd2 100644 (file)
--- a/mod/label/lib.php
+++ b/mod/label/lib.php
@@ -85,6 +85,11 @@ function label_get_coursemodule_info($coursemodule) {
     global $DB;
 
     if ($label = $DB->get_record('label', array('id'=>$coursemodule->instance), 'id, content, name')) {
+        if (empty($label->name)) {
+            // label name missing, fix it
+            $label->name = "label{$label->id}";
+            $DB->set_field('label', 'name', $label->name, array('id'=>$label->id));
+        }
         $info = new object();
         $info->extra = urlencode($label->content);
         $info->name = urlencode($label->name);