Index: trunk/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r8067 -r8097
--- trunk/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 8067)
+++ trunk/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 8097)
@@ -155,7 +155,7 @@
 				$block_params['filter_width'] = $options['filter_width'];
 			}
 			elseif (isset($options['width'])) {
-				if (preg_match('/range/', $options['filter_block'])) {
+				if (isset($options['filter_block']) && preg_match('/range/', $options['filter_block'])) {
 					if ($options['width'] < 60) {
 						$options['width'] = 60;
 						$block_params['filter_width'] = 20;
Index: trunk/core/admin_templates/tree.tpl
===================================================================
diff -u -N -r7635 -r8097
--- trunk/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 7635)
+++ trunk/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 8097)
@@ -112,7 +112,7 @@
 		}
 		return $ret;
 	}
-
+	
 	function checkEditMode()
 	{
 		var $phrase = "<inp2:adm_TreeEditWarrning label="la_EditingInProgress" escape="1"/>";
Index: trunk/core/admin_templates/incs/blocks.tpl
===================================================================
diff -u -N -r7391 -r8097
--- trunk/core/admin_templates/incs/blocks.tpl	(.../blocks.tpl)	(revision 7391)
+++ trunk/core/admin_templates/incs/blocks.tpl	(.../blocks.tpl)	(revision 8097)
@@ -12,11 +12,11 @@
 <inp2:m_block name="kernel_form_end"/>
 		<inp2:m_DumpSystemInfo/>
 	</form>
-	<inp2:m_if check="m_IsDebugMode">
+		<inp2:m_if check="m_IsDebugMode">
 	<script type="text/javascript">
-		addEvent(window, 'resize', OnResizePopup);
+			addEvent(window, 'resize', OnResizePopup);
 	</script>
-	</inp2:m_if>
+		</inp2:m_if>
 <inp2:m_blockend/>
 
 
Index: trunk/core/admin_templates/js/tree.js
===================================================================
diff -u -N -r7855 -r8097
--- trunk/core/admin_templates/js/tree.js	(.../tree.js)	(revision 7855)
+++ trunk/core/admin_templates/js/tree.js	(.../tree.js)	(revision 8097)
@@ -127,7 +127,7 @@
 						// only in case of "true" is returned, used in catalog
 						getFrame(link.target).location.href = this.href;
 					}
-
+					
 					if (!this.treeItem.Expanded && typeof(this.treeItem.folderClick) == 'function') {
 						if (this.treeItem.folderClick());
 					}
Index: trunk/kernel/include/language.php
===================================================================
diff -u -N -r7867 -r8097
--- trunk/kernel/include/language.php	(.../language.php)	(revision 7867)
+++ trunk/kernel/include/language.php	(.../language.php)	(revision 8097)
@@ -689,7 +689,7 @@
             }
             else
             {
-                $sql = "INSERT INTO ".GetTablePrefix()."PhraseCache (Template,PhraseList,CacheDate,ThemeId) VALUES ('";
+                $sql = "REPLACE INTO ".GetTablePrefix()."PhraseCache (Template,PhraseList,CacheDate,ThemeId) VALUES ('";
                 $sql .= $this->TemplateName."','$value',".adodb_date("U").",".$this->ThemeId.")";
             }            
             $this->adodbConnection->Execute($sql);