Index: trunk/kernel/include/language.php
===================================================================
diff -u -N -r912 -r923
--- trunk/kernel/include/language.php	(.../language.php)	(revision 912)
+++ trunk/kernel/include/language.php	(.../language.php)	(revision 923)
@@ -420,10 +420,20 @@
 
             if($data["LanguageId"]>0)
             {
+            	if ($c->m_dirtyFieldsMap["PrimaryLang"] == 1) {
+            		$sql = "UPDATE ".$this->SourceTable." SET PrimaryLang = 0";
+            		$this->adodbConnection->Execute($sql);
+            	}
+            	
                 $c->Update();
             }
             else
             {
+            	if ($c->m_dirtyFieldsMap["PrimaryLang"] == 1) {
+            		$sql = "UPDATE ".$this->SourceTable." SET PrimaryLang = 0";
+            		$this->adodbConnection->Execute($sql);
+            	}
+            	            	
                 $oldid = $c->Get("LanguageId");
                 $c->UnsetIdField();
                 $c->Create();
Index: trunk/kernel/include/portalgroup.php
===================================================================
diff -u -N -r921 -r923
--- trunk/kernel/include/portalgroup.php	(.../portalgroup.php)	(revision 921)
+++ trunk/kernel/include/portalgroup.php	(.../portalgroup.php)	(revision 923)
@@ -115,12 +115,20 @@
         return true;
     }
 
-	function AddUser($UserId,$PrimaryGroup=0,$table='')
+	function AddUser($UserId,$PrimaryGroup=0,$table='', $edit_table = true)
 	{
 		global $objSession;
 		
  	  	// add user to group OR just updates it's status there
  	  	$db =& $this->adodbConnection;
+ 	  	
+ 	  	if ($edit_table) {
+ 	  		$table = $objSession->GetEditTable("UserGroup");//GetTablePrefix().'UserGroup';
+ 	  	}
+ 	  	else {
+ 	  		$table = GetTablePrefix()."UserGroup";
+ 	  	} 	  	
+ 	  	
  	  	if(!$table) $table=$objSession->GetEditTable("UserGroup");
  	  	$group_id = $this->Get('GroupId');
  	  
Index: trunk/kernel/frontaction.php
===================================================================
diff -u -N -r916 -r923
--- trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 916)
+++ trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 923)
@@ -413,7 +413,7 @@
                  if($GroupId>0)
                  {
                    $g = $objGroups->GetItem($GroupId);
-                   $g->AddUser($u->Get("PortalUserId"),1);
+                   $g->AddUser($u->Get("PortalUserId"),1, '', false);
                  }
                
                  $custom = $_POST["custom"];
Index: trunk/admin/logs/session_list.php
===================================================================
diff -u -N -r889 -r923
--- trunk/admin/logs/session_list.php	(.../session_list.php)	(revision 889)
+++ trunk/admin/logs/session_list.php	(.../session_list.php)	(revision 923)
@@ -230,15 +230,19 @@
 $objListView->CurrentPageVar = "Page_Sessionlist";
 $objListView->PerPageVar = "Perpage_Sessionlist";
 
-$objUsers->Query_Item( $sql, $objListView->GetLimitSQL() );
+$objUsers->Query_Item($sql);
 
 $itemcount = 0;
 
 foreach ($objUsers->Items as $value) {
 	$itemcount++;
 }
 
+//echo $itemcount;
 
+$objUsers->Query_Item( $sql, $objListView->GetLimitSQL() );
+
+
 $objListView->SetListItems($objUsers);
 $objListView->IdField = "SessionKey";
 $objListView->PageLinkTemplate = $pathtoroot.$admin."/templates/user_page_link.tpl";
@@ -275,7 +279,7 @@
 	}
 }	
 
-$title = admin_language("la_Show_Log")." (".$objUsers->NumItems().")";
+$title = admin_language("la_Show_Log")." (".$itemcount.")";
 $h = "\n\n<SCRIPT Language=\"JavaScript1.2\">\n".$objListView->GetViewMenu($imagesURL)."\n</SCRIPT>\n";
 int_header($objListToolBar,NULL, $title,NULL,$h);
 if ($filter) { ?>
Index: trunk/kernel/action.php
===================================================================
diff -u -N -r922 -r923
--- trunk/kernel/action.php	(.../action.php)	(revision 922)
+++ trunk/kernel/action.php	(.../action.php)	(revision 923)
@@ -1272,14 +1272,15 @@
      	break;
      	
      case "m_lang_add":        
-         $objEditItems = new clsLanguageList();
-         $objEditItems->SourceTable = $objSession->GetEditTable("Language");
+		 $ado = &GetADODBConnection();
+     	 $objEditItems = new clsLanguageList();
+         $objEditItems->SourceTable = $objSession->GetEditTable("Language");        
+         
          $l = $objEditItems->AddLanguage($_POST["packname"],$_POST["localname"],
                                          (int)$_POST["enabled"],(int)$_POST["primary"],
                                          $_POST["icon"],$_POST["date_format"],$_POST["time_format"],
                                          $_POST["decimal"],$_POST["thousand"],$_POST['charset']);
 
-         $ado = &GetADODBConnection();
          $rs = $ado->Execute("SELECT MIN(LanguageId) as MinValue FROM ".$objEditItems->SourceTable);
          $NewId = $rs->fields["MinValue"]-1;
          $sql = "UPDATE ".$objEditItems->SourceTable." SET LanguageId=".$NewId." WHERE LanguageId=".$l->Get("LanguageId");
@@ -1380,17 +1381,18 @@
      	break;
      	
      case "m_lang_edit":
+     	 $ado = &GetADODBConnection();
          $objEditItems = new clsLanguageList();
          $objEditItems->SourceTable = $objSession->GetEditTable("Language");
+         
          $objEditItems->EditLanguage($_POST["LanguageId"],$_POST["packname"],
                                      $_POST["localname"],(int)$_POST["enabled"],
                                      (int)$_POST["primary"], $_POST["icon"],$_POST["date_format"],
                                      $_POST["time_format"], $_POST["decimal"],$_POST["thousand"],
                                      $_POST['charset']);
                                      
          if($_POST["importlabels"]==1 && $_POST["srcpack"]>0)
-         {
-            $ado = &GetADODBConnection();
+         {            
             $rs = $ado->Execute("SELECT * FROM ".GetTablePrefix()."Phrase WHERE LanguageId=".$_POST["srcpack"]);
             $plist = new clsPhraseList();
             $plist->SourceTable = $objSession->GetEditTable("Phrase");