Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl
===================================================================
diff -u -r5820 -r6026
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl	(.../item_selector_toolbar.tpl)	(revision 5820)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl	(.../item_selector_toolbar.tpl)	(revision 6026)
@@ -4,55 +4,59 @@
 <script type="text/javascript">
 	Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 	var a_toolbar = new ToolBar();
-	 	
+
 	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 				<inp2:m_if check="m_ParamEquals" name="is_catalog" value="1">
-					var $category_ids = Grids['c'].GetSelected();
-					if ($category_ids.length == 0) {
-						// no categories selected, then use current category
-						$category_ids = get_hidden_field('m_cat_id');
-					}
-					set_hidden_field('selected_ids[c]', $category_ids);
+					active_selected = '';
 					if (Grids[$Catalog.ActivePrefix]) {
-						set_hidden_field('selected_ids[' + $Catalog.ActivePrefix + ']', Grids[$Catalog.ActivePrefix].GetSelected());
+						active_selected = Grids[$Catalog.ActivePrefix].GetSelected();
+						set_hidden_field('selected_ids[' + $Catalog.ActivePrefix + ']', active_selected);
 					}
+					if (active_selected.length == 0) {
+						var $category_ids = Grids['c'].GetSelected();
+						if ($category_ids.length == 0) {
+							// no categories selected, then use current category
+							$category_ids = get_hidden_field('m_cat_id');
+						}
+						set_hidden_field('selected_ids[c]', $category_ids);
+					}
 				<inp2:m_else/>
 					var $prefix = $Catalog.ActivePrefix.replace('.<inp2:m_get name="ts"/>', '');
 					set_hidden_field('selected_ids[' + $prefix + ']', Grids[$Catalog.ActivePrefix].GetSelected());
 				</inp2:m_if>
-				
+
 				submit_event('<inp2:m_get name="main_prefix"/>', 'OnProcessSelected');
 			}
 		) );
 	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 				window.close();
 			}
 	 	) );
-	 	
+
 	a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-	
+
 	<inp2:m_if check="m_ParamEquals" name="is_catalog" value="1">
 		a_toolbar.AddButton( new ToolBarButton('upcat', '<inp2:m_phrase label="la_ToolTip_Up" escape="1"/>', function() {
 					$Catalog.go_to_cat($Catalog.ParentCategoryID);
 				}
 		 	) );
-		 	
+
 		a_toolbar.AddButton( new ToolBarButton('homecat', '<inp2:m_phrase label="la_ToolTip_Home" escape="1"/>', function() {
 					$Catalog.go_to_cat(0);
 				}
-		 	) ); 				
+		 	) );
 		a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 	</inp2:m_if>
- 	
+
 	a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 				show_viewmenu(a_toolbar, 'view');
 			}
 	) );
-	
-	a_toolbar.Render();	
-		
+
+	a_toolbar.Render();
+
 	function edit()
 	{
-		
+
 	}
 </script>
\ No newline at end of file