Index: trunk/kernel/admin/include/toolbar/editcategory_relationselect.php
===================================================================
diff -u -r1317 -r1566
--- trunk/kernel/admin/include/toolbar/editcategory_relationselect.php	(.../editcategory_relationselect.php)	(revision 1317)
+++ trunk/kernel/admin/include/toolbar/editcategory_relationselect.php	(.../editcategory_relationselect.php)	(revision 1566)
@@ -146,6 +146,7 @@
 $lang_SubItems = language("la_Text_Subitems");
 
 $selector = isset($_GET['Selector']) ? '&Selector='.$_GET['Selector'] : '';
+$destform = GetVar('destform');
 print <<<END
 
 <script language="JavaScript">
@@ -180,17 +181,19 @@
 var hostname = '$rootURL';
 var env = '$envar';
 var actionlist = new Array();
-var homeURL = "$homeURL$selector";
-var upURL = "$upURL$selector";
+var homeURL = "$homeURL$selector&destform=$destform";
+var upURL = "$upURL$selector&destform=$destform";
 var Categories_Paste = false;
 
-   function InitPage()
-    {
-      addCommonActions();
-      initToolbar('mainToolBar', actionHandler);
-      initCheckBoxes();
-      toggleMenu();
-   }
+   	function InitPage()
+	{
+    	var main_form='popup';
+		if('$destform') main_form='$destform';    
+		addCommonActions(main_form);
+		initToolbar('mainToolBar', actionHandler);
+		initCheckBoxes();
+		//toggleMenu();
+   	}
 
    function AddButtonAction(actionname,actionval)
    {
@@ -214,11 +217,11 @@
      }
    }
 
-   function addCommonActions()
+   function addCommonActions(main_form)
    {
      AddButtonAction('upcat',"get_to_server(upURL,'');");// UP
      AddButtonAction('homecat',"get_to_server(homeURL,'');"); //home
-     AddButtonAction('select',"check_submit();"); //edit
+     AddButtonAction('select',"check_submit('"+main_form+"');"); //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);");
@@ -317,10 +320,10 @@
       return true;
    }
 
-   function check_submit()
+   function check_submit(main_form)
    {
      var formname = '';
-
+      
      if ((activeTab) && (!isAnyChecked('categories')))
      {
         form_name = activeTab.id;
@@ -330,11 +333,11 @@
         form_name = 'categories';
      }
      var f = document.getElementsByName(form_name+'_form')[0];
-     var bf = window.opener.document.getElementById('popup');           
-
+     var bf = window.opener.document.getElementById(main_form);
+    
      if(bf)
      {
-       if(LastCheckedItem)
+     	if(typeof(LastCheckedItem.value) != 'undefined')
        {       
        	try{
          item_id = LastCheckedItem.value;