Index: trunk/admin/users/adduser_items.php
===================================================================
diff -u -r836 -r881
--- trunk/admin/users/adduser_items.php	(.../adduser_items.php)	(revision 836)
+++ trunk/admin/users/adduser_items.php	(.../adduser_items.php)	(revision 881)
@@ -96,17 +96,20 @@
 
 unset($objEditItems);
 
-$objEditItems = new clsCatList();
+$objEditItems = new clsUserManager();
 $objEditItems->SourceTable = $objSession->GetEditTable("PortalUser");
 $objEditItems->EnablePaging = FALSE;
 //Multiedit init
 $en = GetVar('en');
 $objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable);
 
-
 $itemcount=$objEditItems->NumItems();
 $c = $objEditItems->GetItemByIndex($en);
 
+if (!isset($c->Data['PortalUserId'])) {
+	$c = $objEditItems->GetItemByIndex(0);
+}
+
 if($itemcount>1)
 {
 	  if ($en+1 == $itemcount)
@@ -126,7 +129,7 @@
 $section = 'in-portal:edituser_items';
 $sec = $objSections->GetSection($section);
 
-$title = GetTitle("la_Text_User", "la_tab_Images", $c->Get('PortalUserId'), $c->Get('Login'));//admin_language("la_Text_Editing")." ".admin_language("la_Text_User")." '".$c->Get("Login")."' - ".admin_language("la_tab_Images");
+$title = GetTitle("la_Text_User", "la_tab_ItemList", $c->Get('PortalUserId'), $c->Get('Login'));//admin_language("la_Text_Editing")." ".admin_language("la_Text_User")." '".$c->Get("Login")."' - ".admin_language("la_tab_Images");
 
 $objListToolBar = new clsToolBar();
 $objListToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","do_edit_save('save_edit_buttons','".$admin."/users/user_list.php',1);","tool_select.gif");
@@ -157,14 +160,28 @@
 $objListToolBar->AddToInitScript("fwLoadMenus();");
 
 $filter = false; // always initialize variables before use
+$ItemView = $objConfig->Get("UserItem_View");
 
+$NumItems = 0;
+$Item_AllValue = 1;
+for($i=0;$i<$objItemTypes->NumItems(); $i++)
+{      
+	if($objItemTypes->Items[$i]->Get("PrimaryItem")=="1") {	
+	  $Item_AllValue += pow(2,++$NumItems); 	  
+	}
+}
 
-if ($ItemView != $Bit_All) {
+if(!is_numeric($ItemView))
+{
+    $ItemView = $Item_AllValue;
+}
+
+if ($ItemView != $Item_AllValue) {
 	$filter = true;
 }
 
 
-$title = admin_language("la_Text_Editing")." ".admin_language("la_Text_User")." '".$c->Get("Login")."' - ".admin_language("la_tab_ItemList");
+//$title = admin_language("la_Text_Editing")." ".admin_language("la_Text_User")." '".$c->Get("Login")."' - ".admin_language("la_tab_ItemList");
 int_header($objListToolBar,NULL, $title);
 if ($objSession->GetVariable("HasChanges") == 1) {
 ?>