Index: branches/5.3.x/core/admin_templates/js/inp_ckconfig.js
===================================================================
diff -u -N -r15946 -r16594
--- branches/5.3.x/core/admin_templates/js/inp_ckconfig.js	(.../inp_ckconfig.js)	(revision 15946)
+++ branches/5.3.x/core/admin_templates/js/inp_ckconfig.js	(.../inp_ckconfig.js)	(revision 16594)
@@ -37,15 +37,15 @@
 CKEDITOR.config.documentIconsUrl = '/system/user_files/icons'; // for document custom plugin
 
 CKEDITOR.config.toolbar_Default = [
-	['Cut','Copy','Paste','PasteText','PasteFromWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','Preview','-',/*My*/ 'Link','Unlink','Anchor','HorizontalRule','-',/*My*/ 'Image','Flash','MediaEmbed','Document','Table','SpecialChar'],
+	['Cut','Copy','Paste','PasteText','PasteFromWord','-',/*'Templates','-',*/'NewPage','SelectAll','-','Find','Replace','-','Print','Preview','-',/*My*/ 'Link','Unlink','Anchor','HorizontalRule','-',/*My*/ 'Image','Flash','MediaEmbed','Document','Table','SpecialChar'],
 	'/',
 	['Bold','Italic','Underline','Strike','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','NumberedList','BulletedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'],
 	'/',
 	['Styles','Font','FontSize','RemoveFormat','-','Scayt','-', /*My*/'Source', 'Maximize', 'ShowBlocks']
 ];
 
 CKEDITOR.config.toolbar_DebugMode = [
-	['Cut','Copy','Paste','PasteText','PasteFromWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','Preview','-',/*My*/ 'Link','Unlink','Anchor','HorizontalRule','-',/*My*/ 'Image','Flash','MediaEmbed','Document','Table','SpecialChar'],
+	['Cut','Copy','Paste','PasteText','PasteFromWord','-',/*'Templates','-',*/'NewPage','SelectAll','-','Find','Replace','-','Print','Preview','-',/*My*/ 'Link','Unlink','Anchor','HorizontalRule','-',/*My*/ 'Image','Flash','MediaEmbed','Document','Table','SpecialChar'],
 	'/',
 	['Bold','Italic','Underline','Strike','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','NumberedList','BulletedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'],
 	'/',
@@ -54,7 +54,7 @@
 
 CKEDITOR.config.toolbar_Inline = [
 	['InlineSave', 'InlineCancel'],
-	['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Image', 'Document', 'MediaEmbed', 'Link', '-', 'Undo', 'Redo'],
+	['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', /*'Templates', '-',*/ 'Image', 'Document', 'MediaEmbed', 'Link', '-', 'Undo', 'Redo'],
 	['Find', 'Replace', 'Scayt'],
 	'/',
 	['Styles'], ['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat'],
@@ -129,3 +129,5 @@
 
 // add ability to browse for documents
 //CKEDITOR.config.documentsBrowser = true ;
+
+CKEDITOR.config.templates_replaceContent = false;