MDL-15304, MDL-15526 fixing regression; merged from MOODLE_19_STABLE

diff --git a/mod/label/lib.php b/mod/label/lib.php
index a846245d0bde0874fa4796bf40271916c1c68e61..3e1a8a086e9fd5f2c29b865a21adc77bfd74bf3d 100644 (file)
--- a/mod/label/lib.php
+++ b/mod/label/lib.php
@@ -9,8 +9,8 @@ function get_label_name($label) {
     $textlib = textlib_get_instance();
 
     $name = strip_tags(format_string($label->content,true));
-    if ($textlib->strlen($label->name) > LABEL_MAX_NAME_LENGTH) {
-        $label->name = $textlib->substr($label->name, 0, LABEL_MAX_NAME_LENGTH)."...";
+    if ($textlib->strlen($name) > LABEL_MAX_NAME_LENGTH) {
+        $name = $textlib->substr($name, 0, LABEL_MAX_NAME_LENGTH)."...";
     }
 
     if (empty($name)) {