diff --git a/main/inc/lib/fckeditor/fcktemplates.xml.php b/main/inc/lib/fckeditor/fcktemplates.xml.php
index 7f7b4dd9f7..0b606628ed 100644
--- a/main/inc/lib/fckeditor/fcktemplates.xml.php
+++ b/main/inc/lib/fckeditor/fcktemplates.xml.php
@@ -73,7 +73,7 @@ function s($var)
 {
     $search = array('&','<','>');
     $replace = array ('&amp;','&amp;lt;','&amp;gt;');
-    return str_replace($search, $replace, api_utf8_encode(get_lang($var)));
+    return str_replace($search, $replace, api_utf8_encode(get_lang($var, '')));
 }
 
 /**
@@ -115,8 +115,8 @@ function load_platform_templates() {
       	$row['content'] =  str_replace('{REL_PATH}', api_get_path(REL_PATH), $row['content']);
       	$row['content'] =  str_replace('{COURSE_DIR}',$default_course_dir, $row['content']);
 
-		echo '	<Template title="'.s(get_lang($row['title'])).'" image="'.$image.'">
-					<Description>'.s(get_lang($row['comment'])).'</Description>
+		echo '	<Template title="'.s(get_lang($row['title']), '').'" image="'.$image.'">
+					<Description>'.s(get_lang($row['comment']), '').'</Description>
 					<Html>
 						<![CDATA[
 							    '.$row['content'].'
diff --git a/main/inc/lib/fckeditor/toolbars/all_buttons_test.php b/main/inc/lib/fckeditor/toolbars/all_buttons_test.php
index ded23bc1e6..8ac44d6b6a 100644
--- a/main/inc/lib/fckeditor/toolbars/all_buttons_test.php
+++ b/main/inc/lib/fckeditor/toolbars/all_buttons_test.php
@@ -9,7 +9,7 @@ $config['ToolbarSets']['Normal'] = array(
 	array('FitWindow','DocProps','-','Save','NewPage','Preview','-','Templates'),
 	array('Cut','Copy','Paste','PasteText','PasteWord','-','Print'),
 	array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'),
-	array('Link','Unlink','Anchor','Wikilink'),
+	array('Link','Unlink','Anchor','Glossary','Wikilink'),
 	array('mimetex','Image','imgmapPopup','Flash','MP3','EmbedMovies','flvPlayer','YouTube','googlemaps','Smiley'),
 	'/',
 	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'),
