Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1321)
+++ branches/2.8.x/CHANGELOG	(revision 1322)
@@ -11,6 +11,9 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.1 -------------------------------------
+14-Apr-2010 Dietmar Woellbrink (Luisehahne)
+#	Ticket #984 Removing outdated comment-block in class.login.php
+#	Ticket #983 Sorting order of modules and templates inside groups.php
 14-Apr-2010 Dietrich Roland Pehlke (Aldus)
 #	Ticket #982 - Wrong use of heredoc-syntax in some language-files (BG, CS and HR) breaks the installation-process.
 14-Apr-2010 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/groups/groups.php
===================================================================
--- branches/2.8.x/wb/admin/groups/groups.php	(revision 1321)
+++ branches/2.8.x/wb/admin/groups/groups.php	(revision 1322)
@@ -86,7 +86,7 @@
 	
 	// Insert values into module list
 	$template->set_block('main_block', 'module_list_block', 'module_list');
-	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'page'");
+	$result = $database->query('SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "module" AND `function` = "page" ORDER BY `name`');
 	if($result->numRows() > 0) {
 		while($addon = $result->fetchRow()) {
 			$template->set_var('VALUE', $addon['directory']);
@@ -102,7 +102,7 @@
 	
 	// Insert values into template list
 	$template->set_block('main_block', 'template_list_block', 'template_list');
-	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template'");
+	$result = $database->query('SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "template" ORDER BY `name`');
 	if($result->numRows() > 0) {
 		while($addon = $result->fetchRow()) {
 			$template->set_var('VALUE', $addon['directory']);
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1321)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1322)
@@ -52,6 +52,6 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.x');
-if(!defined('REVISION')) define('REVISION', '1321');
+if(!defined('REVISION')) define('REVISION', '1322');
 
 ?>
\ No newline at end of file
Index: branches/2.8.x/wb/framework/class.login.php
===================================================================
--- branches/2.8.x/wb/framework/class.login.php	(revision 1321)
+++ branches/2.8.x/wb/framework/class.login.php	(revision 1322)
@@ -187,30 +187,8 @@
 				// Set a session var so apps can tell user is using default time format
 				$_SESSION['USE_DEFAULT_TIME_FORMAT'] = true;
 			}
+
 			// Get group information
-//			$query = "SELECT * FROM ".$this->GROUPS_TABLE." WHERE group_id = '".$this->get_session('GROUP_ID')."'";
-//			$results = $database->query($query);
-//			$results_array = $results->fetchRow();
-//			$_SESSION['GROUP_NAME'] = $results_array['name'];
-//			// Set system permissions
-//			if($results_array['system_permissions'] != '') {
-//				$_SESSION['SYSTEM_PERMISSIONS'] = explode(',', $results_array['system_permissions']);
-//			} else {
-//				$_SESSION['SYSTEM_PERMISSIONS'] = array();
-//			}
-//			// Set module permissions
-//			if($results_array['module_permissions'] != '') {
-//				$_SESSION['MODULE_PERMISSIONS'] = explode(',', $results_array['module_permissions']);
-//			} else {
-//				$_SESSION['MODULE_PERMISSIONS'] = array();
-//			}
-//			// Set template permissions
-//			if($results_array['template_permissions'] != '') {
-//				$_SESSION['TEMPLATE_PERMISSIONS'] = explode(',', $results_array['template_permissions']);
-//			} else {
-//				$_SESSION['TEMPLATE_PERMISSIONS'] = array();
-//			}
-
 			$_SESSION['SYSTEM_PERMISSIONS'] = array();
 			$_SESSION['MODULE_PERMISSIONS'] = array();
 			$_SESSION['TEMPLATE_PERMISSIONS'] = array();