Take care of empty aliases in glossary xml files when importing them.

See bug 1599. Thanks to skodak. :-)
http://moodle.org/bugs/bug.php?op=show&bugid=1599

Merged from MOODLE_13_STABLE.

diff --git a/mod/glossary/import.php b/mod/glossary/import.php
index cfe712d2b016b92c2728d8ab5600a5cad81768f5..9292092d13ea88776b51d239b257f751036ae034 100644 (file)
--- a/mod/glossary/import.php
+++ b/mod/glossary/import.php
@@ -205,11 +205,14 @@
                     for($k = 0; $k < sizeof($xmlaliases); $k++) {
                     /// Importing aliases
                         $xmlalias = $xmlaliases[$k];
-                        unset($newalias);
-        
-                        $newalias->entryid = $newentry->id;
-                        $newalias->alias = addslashes(trim(utf8_decode($xmlalias['#']['NAME'][0]['#'])));
-                        $newalias->id = insert_record("glossary_alias",$newalias);
+                        $aliasname = $xmlalias['#']['NAME'][0]['#'];
+
+                        if (!empty($aliasname)) {
+                            unset($newalias);
+                            $newalias->entryid = $newentry->id;
+                            $newalias->alias = addslashes(trim(utf8_decode($aliasname)));
+                            $newalias->id = insert_record("glossary_alias",$newalias);
+                        }
                     }
 
                     if ( $catsincl ) {