Juan Carlos Raña 15 years ago
parent
commit
1a66d65e48

+ 3 - 7
main/inc/lib/fckeditor/editor/plugins/asciimath/fckplugin.js

@@ -314,17 +314,13 @@ FCK.UpdateLinkedField = function()
 			if ( head_data )
 			{
 				head_data = head_data.toString().match( /<head\s?[^>]*>(.*?)<\/head\s*>/i ) ;
-				if ( head_data[1] )
+				if ( head_data && head_data.toString().indexOf( 'ASCIIMathML.js' ) != -1 )
 				{
-					head_data = head_data[1] ;
-					if ( head_data.indexOf( 'ASCIIMathML.js' ) != -1 )
-					{
-						has_script = true ;
-					}
+					has_script = true ;
 				}
 			}
 
-			if ( !has_script )
+			if ( has_formula && !has_script )
 			{
 				// TODO: This fragment works in WYSIWYG mode only.
 				script = FCK.EditorDocument.createElement( 'script' ) ;

File diff suppressed because it is too large
+ 0 - 0
main/inc/lib/fckeditor/editor/plugins/asciimath/fckplugin_compressed.js


+ 1 - 1
main/install/dokeos_main.sql

@@ -610,7 +610,7 @@ VALUES
 ('allow_personal_agenda',NULL,'radio','User','false','AllowPersonalAgendaTitle','AllowPersonalAgendaComment',NULL,NULL, 0),
 ('display_coursecode_in_courselist',NULL,'radio','Platform','true','DisplayCourseCodeInCourselistTitle','DisplayCourseCodeInCourselistComment',NULL,NULL, 0),
 ('display_teacher_in_courselist',NULL,'radio','Platform','true','DisplayTeacherInCourselistTitle','DisplayTeacherInCourselistComment',NULL,NULL, 0),
-('use_document_title',NULL,'radio','Tools','false','UseDocumentTitleTitle','UseDocumentTitleComment',NULL,NULL, 0),
+('use_document_title',NULL,'radio','Tools','true','UseDocumentTitleTitle','UseDocumentTitleComment',NULL,NULL, 0),
 ('permanently_remove_deleted_files',NULL,'radio','Tools','false','PermanentlyRemoveFilesTitle','PermanentlyRemoveFilesComment',NULL,NULL, 0),
 ('dropbox_allow_overwrite',NULL,'radio','Tools','true','DropboxAllowOverwriteTitle','DropboxAllowOverwriteComment',NULL,NULL, 0),
 ('dropbox_max_filesize',NULL,'textfield','Tools','100000000','DropboxMaxFilesizeTitle','DropboxMaxFilesizeComment',NULL,NULL, 0),

Some files were not shown because too many files changed in this diff