Merge branch 'MDL-52983' of git://github.com/aolley/moodle

2016-02-08 13:05:30 +01:00
parent 04b3c78da4 15c9a9d726
commit ba8491ae3f
1 changed files with 2 additions and 0 deletions
@@ -163,6 +163,8 @@ class MoodleExcelWorksheet {
        $name = strtr(trim($name, "'"), '[]*/\?:', '       ');
        // Shorten the title if necessary.
        $name = core_text::substr($name, 0, 31);
+        // After the substr, we might now have a single quote on the end.
+        $name = trim($name, "'");

        if ($name === '') {
            // Name is required!