Index: trunk/kernel/admin/include/toolbar/editcategory_relationselect.php
===================================================================
diff -u -r13 -r1317
--- trunk/kernel/admin/include/toolbar/editcategory_relationselect.php	(.../editcategory_relationselect.php)	(revision 13)
+++ trunk/kernel/admin/include/toolbar/editcategory_relationselect.php	(.../editcategory_relationselect.php)	(revision 1317)
@@ -221,8 +221,9 @@
      AddButtonAction('select',"check_submit();"); //edit
      AddButtonAction('stop',"window.close();"); //delete
      AddButtonAction('view',"toggleMenu(); window.FW_showMenu(window.cat_menu,getRealLeft(button) - ((document.all) ? 6 : -2),getRealTop(button)+32);");
-     AddButtonAction('search_a',"setSearchMenu(); window.FW_showMenu(window.SearchMenu,getRealLeft(button)-134 - ((document.all) ? 8 : -1),getRealTop(button)+22);");
+     //AddButtonAction('search_a',"setSearchMenu(); window.FW_showMenu(window.SearchMenu,getRealLeft(button)-134 - ((document.all) ? 8 : -1),getRealTop(button)+22);");
      AddButtonAction('search_b',"search_submit();");
+     AddButtonAction('search_c',"ClearSearch();");
    }
 
    function AdminCatNav(url)
@@ -391,41 +392,41 @@
     
     }
 
-    function setSearchMenu()
-    {
+//    function setSearchMenu()
+//    {
+//
+//      window.SearchMenu = new Menu("search");
+//      SearchMenu.addMenuItem(lang_All,"SetSearchType('all');",getSType('all'));
+//      SearchMenu.addMenuSeparator()
+//
+//      SearchMenu.addMenuItem(lang_Categories, "SetSearchType('categories');",getSType('categories'));
+//      param = "";
+//
+//      for (var i = 0; i < tabIDs.length; i++)
+//      {
+//        d = document.getElementById(tabIDs[i]);
+//        if(d)
+//        {
+//            tabname = d.getAttribute("tabTitle");
+//            param = "SetSearchType('"+tabname+"');";
+//
+//            SearchMenu.addMenuItem(tabname,param,getSType(tabname));
+//        }
+//      }  
+//
+//      SearchMenu.addMenuSeparator();
+//      SearchMenu.addMenuItem(lang_All+' '+lang_Categories,"SetSearchScope('0');",getSScope(0));
+//      SearchMenu.addMenuItem(lang_SubSearch,"ToggleNewSearch();",isNewSearch());
+//      SearchMenu.addMenuItem(lang_Current+' '+lang_Categories,"SetSearchScope('2');",getSScope(2));
+//      SearchMenu.addMenuItem(lang_Within+' '+lang_Categories,"SetSearchScope('1');",getSScope(1));
+//     
+//      SearchMenu.addMenuSeparator();
+//
+//      window.SearchMenu.addMenuItem('$mnuClearSearch',"ClearSearch();","");
+//      window.triedToWriteMenus = false;
+//      window.SearchMenu.writeMenus();
+//    }
 
-      window.SearchMenu = new Menu("search");
-      SearchMenu.addMenuItem(lang_All,"SetSearchType('all');",getSType('all'));
-      SearchMenu.addMenuSeparator()
-
-      SearchMenu.addMenuItem(lang_Categories, "SetSearchType('categories');",getSType('categories'));
-      param = "";
-
-      for (var i = 0; i < tabIDs.length; i++)
-      {
-        d = document.getElementById(tabIDs[i]);
-        if(d)
-        {
-            tabname = d.getAttribute("tabTitle");
-            param = "SetSearchType('"+tabname+"');";
-
-            SearchMenu.addMenuItem(tabname,param,getSType(tabname));
-        }
-      }  
-
-      SearchMenu.addMenuSeparator();
-      SearchMenu.addMenuItem(lang_All+' '+lang_Categories,"SetSearchScope('0');",getSScope(0));
-      SearchMenu.addMenuItem(lang_SubSearch,"ToggleNewSearch();",isNewSearch());
-      SearchMenu.addMenuItem(lang_Current+' '+lang_Categories,"SetSearchScope('2');",getSScope(2));
-      SearchMenu.addMenuItem(lang_Within+' '+lang_Categories,"SetSearchScope('1');",getSScope(1));
-     
-      SearchMenu.addMenuSeparator();
-
-      window.SearchMenu.addMenuItem('$mnuClearSearch',"ClearSearch();","");
-      window.triedToWriteMenus = false;
-      window.SearchMenu.writeMenus();
-    }
-
     function Category_SortMenu(caption)
     {
         menu_sorting = new Menu(caption);
Index: trunk/admin/relation_select.php
===================================================================
diff -u -r898 -r1317
--- trunk/admin/relation_select.php	(.../relation_select.php)	(revision 898)
+++ trunk/admin/relation_select.php	(.../relation_select.php)	(revision 1317)
@@ -295,9 +295,37 @@
           	<input type="hidden" name="Selector" value="<?php echo $Selector; ?>">
           <table cellspacing="0" cellpadding="0"><tr>
           <td><?php echo admin_language($SearchLabel); ?>&nbsp;</td>
-          <td><input ID="SearchWord" type="text" name="SearchWord" size="10" style="border-width: 1; border-style: solid; border-color: #999999"></td>
-          <td><img action="search_b" src="<?php echo $imagesURL."/toolbar/";?>/icon16_search.gif" alt="<?php echo admin_language("la_ToolTip_Search"); ?>" align="absMiddle" onclick="this.action = this.getAttribute('action'); actionHandler(this);" src="<?php echo $imagesURL."/toolbar/";?>/arrow16.gif" onmouseover="this.src='<?php echo $imagesURL."/toolbar/";?>/icon16_search_f2.gif'" onmouseout="this.src='<?php echo $imagesURL."/toolbar/";?>/icon16_search.gif'" style="cursor:hand" width="22" width="22"><img action="search_a" alt="<?php echo admin_language("la_ToolTip_Search"); ?>" align="absMiddle" onclick="this.action = this.getAttribute('action'); actionHandler(this);" src="<?php echo $imagesURL."/toolbar/";?>/arrow16.gif" onmouseover="this.src='<?php echo $imagesURL."/toolbar/";?>/arrow16_f2.gif'" onmouseout="this.src='<?php echo $imagesURL."/toolbar/";?>/arrow16.gif'" style="cursor:hand">
-          <img action="search_c" src="<?php echo $imagesURL."/toolbar/";?>/icon16_search_reset.gif" alt="<?php echo admin_language("la_ToolTip_Search"); ?>" align="absMiddle" onclick="this.action = this.getAttribute('action'); actionHandler(this);" onmouseover="this.src='<?php echo $imagesURL."/toolbar/";?>/icon16_search_reset_f2.gif'" onmouseout="this.src='<?php echo $imagesURL."/toolbar/";?>/icon16_search_reset.gif'" style="cursor:hand" width="22" width="22">&nbsp;
+          <td><input id="SearchWord" type="text" name="SearchWord" size="10" style="border-width: 1; border-style: solid; border-color: #999999" value="<?php echo $objSession->GetVariable('SearchWord'); ?>"></td>
+          <td>
+          	<img
+          			action="search_b"
+          			src="<?php echo $imagesURL."/toolbar/";?>/icon16_search.gif"
+          			alt="<?php echo admin_language("la_ToolTip_Search"); ?>"
+          			align="absMiddle"
+          			onclick="this.action = this.getAttribute('action'); actionHandler(this);"
+          			src="<?php echo $imagesURL."/toolbar/";?>/arrow16.gif"
+          			onmouseover="this.src='<?php echo $imagesURL."/toolbar/";?>/icon16_search_f2.gif'"
+          			onmouseout="this.src='<?php echo $imagesURL."/toolbar/";?>/icon16_search.gif'"
+          			style="cursor:hand"
+          			width="22"
+          			width="22">
+          <!--	<img
+          			action="search_a"
+          			alt="<?php echo admin_language("la_ToolTip_Search"); ?>"
+          			align="absMiddle"
+          			onclick="this.action = this.getAttribute('action'); actionHandler(this);"
+          			src="<?php echo $imagesURL."/toolbar/";?>/arrow16.gif"
+          			onmouseover="this.src='<?php echo $imagesURL."/toolbar/";?>/arrow16_f2.gif'"
+          			onmouseout="this.src='<?php echo $imagesURL."/toolbar/";?>/arrow16.gif'"
+          			style="cursor:hand">-->
+          	
+          	<img
+          			action="search_c"
+          			src="<?php echo $imagesURL."/toolbar/";?>/icon16_search_reset.gif"
+          			alt="<?php echo admin_language("la_ToolTip_Search"); ?>"
+          			align="absMiddle"
+          			onclick="this.action = this.getAttribute('action'); actionHandler(this);"
+          			onmouseover="this.src='<?php echo $imagesURL."/toolbar/";?>/icon16_search_reset_f2.gif'" onmouseout="this.src='<?php echo $imagesURL."/toolbar/";?>/icon16_search_reset.gif'" style="cursor:hand" width="22" width="22">&nbsp;
           </td>
           </tr></table>
           </FORM>
@@ -315,7 +343,7 @@
     $OrderBy = $objCatList->QueryOrderByClause(TRUE,TRUE,TRUE); 
     if($SearchType=="categories" || $SearchType="all")
     {
-      $list = $objSession->GetVariable("SearchWord");
+      $list = $objSession->GetVariable('SearchWord');
       $SearchQuery = $objCatList->AdminSearchWhereClause($list);
       if(strlen($SearchQuery))
       {
@@ -397,6 +425,29 @@
     echo "  var single_select = true;";
 ?>   
    InitPage();
+  cats_on = theMainScript.GetCookie('cats_tab_on');
+   if (cats_on == 0) {
+   	 toggleCategoriesB(document.getElementById('cats_tab'), true);
+   }
+   
+   tabs_on = theMainScript.GetCookie('tabs_on');
+   if (tabs_on == '1' || tabs_on == null) {
+	   if(default_tab.length == 0 || default_tab == 'categories' )
+	   { 
+	   		cookie_start = theMainScript.GetCookie('active_tab');
+	   		if (cookie_start != null) start_tab = cookie_start;
+	     if(start_tab!=null) {
+	     	//alert('ok');
+	       toggleTabB(start_tab, true);
+	     }
+	   }
+	   else
+	   {
+	   		//alert('ok');
+	       toggleTabB(default_tab,true);
+	   }
+	 }
+      
    //toggleTabB(start_tab, true);
 </script>
 <?php int_footer(); ?>
Index: trunk/kernel/include/debugger.php
===================================================================
diff -u -r1314 -r1317
--- trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 1314)
+++ trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 1317)
@@ -258,7 +258,9 @@
 			{
 				if( dbg_ConstOn('DBG_USE_HIGHLIGHT') )
 				{
+					$string = str_replace('\\','_no_match_string_',$string);
 					$string = highlight_string('<?php '.$string.'?>', true);
+					$string = str_replace('_no_match_string_','\\',$string);
 					return preg_replace('/&lt;\?(.*)php (.*)\?&gt;/s','$2',$string);
 				}
 				else