Index: branches/5.2.x/admin/system_presets/simple/inp_ckconfig.js
===================================================================
--- branches/5.2.x/admin/system_presets/simple/inp_ckconfig.js	(revision 16736)
+++ branches/5.2.x/admin/system_presets/simple/inp_ckconfig.js	(revision 16737)
@@ -1,131 +1,132 @@
 CKEDITOR.config.title = '';
 
 /*
 * Append here extra CSS rules that should be applied into the editing area.
 * Example:
 * config.extraCss = "body {color:#FF0000;}";
 */
 CKEDITOR.config.extraCss = "";
 
 /**
 * CKEditor's editing area body ID & class.
 * This setting can be used if CKEditor does not work well with your theme by default.
 */
 CKEDITOR.config.bodyClass = '';
 CKEDITOR.config.bodyId = '';
 
 // Preview
 //CKEDITOR.config.PreviewUrl = '';
 //CKEDITOR.config.ContentId = '';
 
 //CKEDITOR.config.PreloadImages = [ CKEDITOR.config.SkinPath + 'images/toolbar.start.gif', CKEDITOR.config.SkinPath + 'images/toolbar.buttonarrow.gif', CKEDITOR.config.BasePath + 'plugins/images/document.gif' ] ;
 
 //CKEDITOR.config.PluginsPath = CKEDITOR.config.BasePath + 'plugins/' ;
 
 CKEDITOR.config.entities = false;
 
 CKEDITOR.config.extraPlugins = 'my_link,my_document,my_maximize,my_inline,sourcedialog';
 
 //CKEDITOR.plugins.add('MySource');
 //CKEDITOR.plugins.add('MyPreview');
 //CKEDITOR.plugins.add('MyLink');
 //CKEDITOR.plugins.add('MyImage');
 //CKEDITOR.plugins.add('document', 'en,ru');
 
 CKEDITOR.config.protectedSource.push( /(<inp2:[^\>]+>)|(<\/inp2:[^\>]+>)|(<inp2:[^\>]+\/>)/gi ) ;
 
 CKEDITOR.config.documentIconsUrl = '/system/user_files/icons'; // for document custom plugin
 
 CKEDITOR.config.toolbar_Default = [
 	['Styles'],
 	['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat'],
 	['NumberedList', 'BulletedList', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
 	['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Image', 'Document', 'MediaEmbed', 'Link', '-', 'Undo', 'Redo'],
 	['Find', 'Replace', 'Scayt']
 ];
 
 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'],
 	'/',
 	['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_Inline = [
 	['InlineSave', 'InlineCancel'],
 	['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Image', 'Document', 'MediaEmbed', 'Link', '-', 'Undo', 'Redo'],
 	['Find', 'Replace', 'Scayt'],
 	'/',
 	['Styles'], ['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat'],
 	['NumberedList', 'BulletedList', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', 'Sourcedialog']
 ];
 
 /*CKEDITOR.config.toolbar_Simple = [
 	['Styles'],
 	['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat'],
 	['NumberedList', 'BulletedList', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
 	['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'],
 	['Find', 'Replace', 'Scayt']
 ];*/
 
 //CKEDITOR.config.toolbar_Full = [
 //    [ 'Source','-','Save','NewPage','DocProps','Preview','Print','-','Templates' ],
 //    [ 'Cut','Copy','Paste','PasteText','PasteFromWord','-','Undo','Redo' ],
 //    [ 'Find','Replace','-','SelectAll','-','SpellChecker', 'Scayt' ],
 //    [ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ],
 //    '/',
 //    [ 'Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat' ],
 //    [ 'NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote','CreateDiv','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl' ],
 //    [ 'Link','Unlink','Anchor' ],
 //    [ 'Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak' ],
 //    '/',
 //    [ 'Styles','Format','Font','FontSize' ],
 //    [ 'TextColor','BGColor' ],
 //    [ 'Maximize', 'ShowBlocks','-','About' ]
 //];
 
 CKEDITOR.config.enterMode = CKEDITOR.ENTER_BR ;		// p | div | br
 CKEDITOR.config.shiftEnterMode = CKEDITOR.ENTER_P ;	// p | div | br
 
 /*CKEDITOR.config.keystrokes = [
 	[ CKEDITOR.CTRL + 65 *//*A*//*, true ],
 	[ CKEDITOR.CTRL + 67 *//*C*//*, true ],
 	[ CKEDITOR.CTRL + 70 *//*F*//*, true ],
 	[ CKEDITOR.CTRL + 83 *//*S*//*, true ],
 	[ CKEDITOR.CTRL + 84 *//*T*//*, true ],
 	[ CKEDITOR.CTRL + 88 *//*X*//*, true ],
 	[ CKEDITOR.CTRL + 86 *//*V*//*, 'Paste' ],
 	[ CKEDITOR.CTRL + 45 *//*INS*//*, true ],
 	[ CKEDITOR.SHIFT + 45 *//*INS*//*, 'Paste' ],
 	[ CKEDITOR.CTRL + 88 *//*X*//*, 'Cut' ],
 	[ CKEDITOR.SHIFT + 46 *//*DEL*//*, 'Cut' ],
 	[ CKEDITOR.CTRL + 90 *//*Z*//*, 'Undo' ],
 	[ CKEDITOR.CTRL + 89 *//*Y*//*, 'Redo' ],
 	[ CKEDITOR.CTRL + CKEDITOR.SHIFT + 90 *//*Z*//*, 'Redo' ],
 	[ CKEDITOR.CTRL + 76 *//*L*//*, 'Link' ],
 	[ CKEDITOR.CTRL + 66 *//*B*//*, 'Bold' ],
 	[ CKEDITOR.CTRL + 73 *//*I*//*, 'Italic' ],
 	[ CKEDITOR.CTRL + 85 *//*U*//*, 'Underline' ],
 	[ CKEDITOR.CTRL + CKEDITOR.SHIFT + 83 *//*S*//*, 'Save' ],
 	[ CKEDITOR.CTRL + CKEDITOR.ALT + 13 *//*ENTER*//*, 'FitWindow' ]
 ] ;*/
 
 //CKEDITOR.config.menu_groups = 'generic,anchor,flash,select,textarea,checkbox,radio,textfield,hiddenfield,imagebutton,button,bulletedlist,numberedlist,table,form';
 
 CKEDITOR.config.font_names = 'Arial Narrow;Arial;Sans-Serif;Serif;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ;
 CKEDITOR.config.fontSize_sizes = 'xx-small;x-small;small;medium;large;x-large;xx-large' ;
 
 CKEDITOR.config.filebrowserBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html';
 CKEDITOR.config.filebrowserUploadUrl = CKEDITOR.basePath + 'ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Files';
 
 CKEDITOR.config.filebrowserImageBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html?type=Images';
 CKEDITOR.config.filebrowserImageUploadUrl = CKEDITOR.basePath + 'ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Images';
 
 CKEDITOR.config.filebrowserFlashBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html?type=Flash';
 CKEDITOR.config.filebrowserFlashUploadUrl = CKEDITOR.basePath + 'ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Flash';
 
 CKEDITOR.config.filebrowserDocumentBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html?type=Documents';
 
 // add ability to browse for documents
 //CKEDITOR.config.documentsBrowser = true ;
+CKEDITOR.config.allowedContent = true;
Index: branches/5.2.x/core/admin_templates/js/inp_ckconfig.js
===================================================================
--- branches/5.2.x/core/admin_templates/js/inp_ckconfig.js	(revision 16736)
+++ branches/5.2.x/core/admin_templates/js/inp_ckconfig.js	(revision 16737)
@@ -1,131 +1,132 @@
 CKEDITOR.config.title = '';
 
 /*
 * Append here extra CSS rules that should be applied into the editing area.
 * Example:
 * config.extraCss = "body {color:#FF0000;}";
 */
 CKEDITOR.config.extraCss = "";
 
 /**
 * CKEditor's editing area body ID & class.
 * This setting can be used if CKEditor does not work well with your theme by default.
 */
 CKEDITOR.config.bodyClass = '';
 CKEDITOR.config.bodyId = '';
 
 // Preview
 //CKEDITOR.config.PreviewUrl = '';
 //CKEDITOR.config.ContentId = '';
 
 //CKEDITOR.config.PreloadImages = [ CKEDITOR.config.SkinPath + 'images/toolbar.start.gif', CKEDITOR.config.SkinPath + 'images/toolbar.buttonarrow.gif', CKEDITOR.config.BasePath + 'plugins/images/document.gif' ] ;
 
 //CKEDITOR.config.PluginsPath = CKEDITOR.config.BasePath + 'plugins/' ;
 
 CKEDITOR.config.entities = false;
 
 CKEDITOR.config.extraPlugins = 'my_link,my_document,my_maximize,my_inline,sourcedialog';
 
 //CKEDITOR.plugins.add('MySource');
 //CKEDITOR.plugins.add('MyPreview');
 //CKEDITOR.plugins.add('MyLink');
 //CKEDITOR.plugins.add('MyImage');
 //CKEDITOR.plugins.add('document', 'en,ru');
 
 CKEDITOR.config.protectedSource.push( /(<inp2:[^\>]+>)|(<\/inp2:[^\>]+>)|(<inp2:[^\>]+\/>)/gi ) ;
 
 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'],
 	'/',
 	['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'],
 	'/',
 	['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_Inline = [
 	['InlineSave', 'InlineCancel'],
 	['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Image', 'Document', 'MediaEmbed', 'Link', '-', 'Undo', 'Redo'],
 	['Find', 'Replace', 'Scayt'],
 	'/',
 	['Styles'], ['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat'],
 	['NumberedList', 'BulletedList', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', 'Sourcedialog']
 ];
 
 /*CKEDITOR.config.toolbar_Simple = [
 	['Styles'],
 	['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat'],
 	['NumberedList', 'BulletedList', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
 	['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'],
 	['Find', 'Replace', 'Scayt']
 ];*/
 
 //CKEDITOR.config.toolbar_Full = [
 //    [ 'Source','-','Save','NewPage','DocProps','Preview','Print','-','Templates' ],
 //    [ 'Cut','Copy','Paste','PasteText','PasteFromWord','-','Undo','Redo' ],
 //    [ 'Find','Replace','-','SelectAll','-','SpellChecker', 'Scayt' ],
 //    [ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ],
 //    '/',
 //    [ 'Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat' ],
 //    [ 'NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote','CreateDiv','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl' ],
 //    [ 'Link','Unlink','Anchor' ],
 //    [ 'Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak' ],
 //    '/',
 //    [ 'Styles','Format','Font','FontSize' ],
 //    [ 'TextColor','BGColor' ],
 //    [ 'Maximize', 'ShowBlocks','-','About' ]
 //];
 
 CKEDITOR.config.enterMode = CKEDITOR.ENTER_BR ;		// p | div | br
 CKEDITOR.config.shiftEnterMode = CKEDITOR.ENTER_P ;	// p | div | br
 
 /*CKEDITOR.config.keystrokes = [
 	[ CKEDITOR.CTRL + 65 *//*A*//*, true ],
 	[ CKEDITOR.CTRL + 67 *//*C*//*, true ],
 	[ CKEDITOR.CTRL + 70 *//*F*//*, true ],
 	[ CKEDITOR.CTRL + 83 *//*S*//*, true ],
 	[ CKEDITOR.CTRL + 84 *//*T*//*, true ],
 	[ CKEDITOR.CTRL + 88 *//*X*//*, true ],
 	[ CKEDITOR.CTRL + 86 *//*V*//*, 'Paste' ],
 	[ CKEDITOR.CTRL + 45 *//*INS*//*, true ],
 	[ CKEDITOR.SHIFT + 45 *//*INS*//*, 'Paste' ],
 	[ CKEDITOR.CTRL + 88 *//*X*//*, 'Cut' ],
 	[ CKEDITOR.SHIFT + 46 *//*DEL*//*, 'Cut' ],
 	[ CKEDITOR.CTRL + 90 *//*Z*//*, 'Undo' ],
 	[ CKEDITOR.CTRL + 89 *//*Y*//*, 'Redo' ],
 	[ CKEDITOR.CTRL + CKEDITOR.SHIFT + 90 *//*Z*//*, 'Redo' ],
 	[ CKEDITOR.CTRL + 76 *//*L*//*, 'Link' ],
 	[ CKEDITOR.CTRL + 66 *//*B*//*, 'Bold' ],
 	[ CKEDITOR.CTRL + 73 *//*I*//*, 'Italic' ],
 	[ CKEDITOR.CTRL + 85 *//*U*//*, 'Underline' ],
 	[ CKEDITOR.CTRL + CKEDITOR.SHIFT + 83 *//*S*//*, 'Save' ],
 	[ CKEDITOR.CTRL + CKEDITOR.ALT + 13 *//*ENTER*//*, 'FitWindow' ]
 ] ;*/
 
 //CKEDITOR.config.menu_groups = 'generic,anchor,flash,select,textarea,checkbox,radio,textfield,hiddenfield,imagebutton,button,bulletedlist,numberedlist,table,form';
 
 CKEDITOR.config.font_names = 'Arial Narrow;Arial;Sans-Serif;Serif;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ;
 CKEDITOR.config.fontSize_sizes = 'xx-small;x-small;small;medium;large;x-large;xx-large' ;
 
 CKEDITOR.config.filebrowserBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html';
 CKEDITOR.config.filebrowserUploadUrl = CKEDITOR.basePath + 'ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Files';
 
 CKEDITOR.config.filebrowserImageBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html?type=Images';
 CKEDITOR.config.filebrowserImageUploadUrl = CKEDITOR.basePath + 'ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Images';
 
 CKEDITOR.config.filebrowserFlashBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html?type=Flash';
 CKEDITOR.config.filebrowserFlashUploadUrl = CKEDITOR.basePath + 'ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Flash';
 
 CKEDITOR.config.filebrowserDocumentBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html?type=Documents';
 
 // add ability to browse for documents
 //CKEDITOR.config.documentsBrowser = true ;
+CKEDITOR.config.allowedContent = true;