From: Sam Hemelryk <sam@moodle.com>
Date: Tue, 7 Jun 2011 08:13:52 +0000 (+0800)
Subject: Merge branch 'MDL-27732-glossary-introformat' of git://github.com/mudrd8mz/moodle
X-Git-Tag: v2.1.0~222
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=ac6668198b4b01565acae197bbccb204714b4349;hp=f5936345cdcc69e250963b6cafd073c5012e54d8

Merge branch 'MDL-27732-glossary-introformat' of git://github.com/mudrd8mz/moodle
---

diff --git a/mod/glossary/backup/moodle2/backup_glossary_stepslib.php b/mod/glossary/backup/moodle2/backup_glossary_stepslib.php
index 3fa69cceba4..20b63285c4f 100644
--- a/mod/glossary/backup/moodle2/backup_glossary_stepslib.php
+++ b/mod/glossary/backup/moodle2/backup_glossary_stepslib.php
@@ -38,7 +38,7 @@ class backup_glossary_activity_structure_step extends backup_activity_structure_
 
         // Define each element separated
         $glossary = new backup_nested_element('glossary', array('id'), array(
-            'name', 'intro', 'allowduplicatedentries', 'displayformat',
+            'name', 'intro', 'introformat', 'allowduplicatedentries', 'displayformat',
             'mainglossary', 'showspecial', 'showalphabet', 'showall',
             'allowcomments', 'allowprintview', 'usedynalink', 'defaultapproval',
             'globalglossary', 'entbypage', 'editalways', 'rsstype',