diff --git a/forms/class/forms.php b/forms/class/forms.php
index 47b4266..3eb86cb 100644
--- a/forms/class/forms.php
+++ b/forms/class/forms.php
@@ -13,7 +13,7 @@
 	 *
 	 * @package AVE.cms
 	 * @subpackage module: forms
-	 * @since 1.4
+	 * @since 2.1.0
 	 * @author
 	 * @filesource
 	 */
@@ -848,7 +848,7 @@ function _cleanvar($var)
 			$assign['rubrics'] = $this->_rubrics();
 
 			// назначаем массив CodeMirror
-			$assign['codemirror'] = array(
+			$assign['codemirror_data'] = array(
 				'rubheader'			=> 200,
 				'from_name'			=> 60,
 				'from_email'		=> 60,
diff --git a/forms/info.php b/forms/info.php
index f07264c..d61eed1 100644
--- a/forms/info.php
+++ b/forms/info.php
@@ -4,7 +4,7 @@
 
 	$module = array(
 		'ModuleSysName'			=> 'forms',
-		'ModuleVersion'			=> '2.0.0',
+		'ModuleVersion'			=> '2.1.0',
 		'ModuleAutor'			=> 'AVE.cms Team',
 		'ModuleCopyright'		=> '© 2007-' . date('Y') . ' AVE.cms',
 		'ModuleIsFunction'		=> 1,
diff --git a/forms/templates/form_edit.tpl b/forms/templates/form_edit.tpl
index 3708712..441825f 100644
--- a/forms/templates/form_edit.tpl
+++ b/forms/templates/form_edit.tpl
@@ -784,10 +784,16 @@ $(document)
 {/literal}
 
 <!-- Оформляем поля в CodeMirror -->
-{foreach from=$codemirror key='cdmr_id' item='cdmr_h'}
+<script type="text/javascript">var hlLine;</script>
+
+{* Итерируем по новому, чистому массиву *}
+{foreach from=$codemirror_data key='cdmr_id' item='cdmr_h'}
+    
 	{if $ave15}
+		{* Ветка $ave15 (инклуд) *}
 		{include file="$codemirror_editor" ctrls='form_save();' conn_id="_$cdmr_id" textarea_id=$cdmr_id height=$cdmr_h}
 	{else}
+		{* Ветка !ave15 (оригинальный код) *}
 		<script>
 		var editor_{$cdmr_id} = CodeMirror.fromTextArea(document.getElementById('{$cdmr_id}'), {ldelim}
 			extraKeys: {ldelim}
@@ -813,19 +819,6 @@ $(document)
 		{rdelim});
 
 		editor_{$cdmr_id}.setSize('100%',{$cdmr_h});
-
-		function getSelectedRange_{$cdmr_id}() {ldelim}
-			return {ldelim}
-				from: editor_{$cdmr_id}.getCursor(true),
-				to: editor_{$cdmr_id}.getCursor(false)
-			{rdelim};
-		{rdelim}
-
-		function textSelection_{$cdmr_id}(startTag,endTag) {ldelim}
-			var range = getSelectedRange_{$cdmr_id}();
-			editor_{$cdmr_id}.replaceRange(startTag + editor_{$cdmr_id}.getRange(range.from, range.to) + endTag, range.from, range.to)
-			editor_{$cdmr_id}.setCursor(range.from.line, range.from.ch + startTag.length);
-		{rdelim}
 		</script>
 	{/if}
 {/foreach}