[svn r17118] new field display_order in glossary table (see FS#3293)

main/inc/lib/add_course.lib.inc.php

@@ -1634,6 +1634,7 @@ function update_Db_course($courseDbName)
 			  glossary_id int unsigned NOT NULL auto_increment,			  
 			  name varchar(255) NOT NULL,
 			  description text not null,
+			  display_order int,		
 			  PRIMARY KEY  (glossary_id)
 			)";
 	$result = api_sql_query($sql, __FILE__, __LINE__) or die(mysql_error($sql));

main/install/migrate-db-1.8.5-1.8.6-pre.sql

@@ -133,4 +133,6 @@ ALTER TABLE forum_notification CHANGE post_id post_id INT NULL;
 ALTER TABLE quiz_answer CHANGE hotspot_coordinates hotspot_coordinates text;
 ALTER TABLE group_info ADD forum_state TINYINT NULL AFTER announcements_state;
 CREATE TABLE calendar_event_attachment ( id int NOT NULL auto_increment, path varchar(255) NOT NULL, comment text, size int NOT NULL default 0, agenda_id int NOT NULL, filename varchar(255) NOT NULL, PRIMARY KEY (id) );
-INSERT INTO course_setting(variable,value,category) VALUES ('allow_open_chat_window',0,'chat');
+ALTER TABLE glossary ADD display_order int;
+CREATE TABLE calendar_event_attachment ( id int NOT NULL auto_increment, path varchar(255) NOT NULL, comment text, size int NOT NULL default 0, agenda_id int NOT NULL, filename varchar(255) NOT NULL, PRIMARY KEY (id) );
+INSERT INTO course_setting(variable,value,category) VALUES ('allow_open_chat_window',0,'chat');>>>>>>> .r17111