Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 2099)
+++ branches/2.8.x/CHANGELOG	(revision 2100)
@@ -11,6 +11,8 @@
 ! = Update/Change
 ===============================================================================
 
+11 Feb-2014 Build 2100 Manuela v.d.Decken(DarkViper)
+# fixes from rev.2098/99
 11 Feb-2014 Build 2099 Manuela v.d.Decken(DarkViper)
 # first fixes from rev.2098
 11 Feb-2014 Build 2098 Manuela v.d.Decken(DarkViper)
Index: branches/2.8.x/wb/upgrade-script.php
===================================================================
--- branches/2.8.x/wb/upgrade-script.php	(revision 2099)
+++ branches/2.8.x/wb/upgrade-script.php	(revision 2100)
@@ -87,7 +87,7 @@
 $oReg = WbAdaptor::getInstance();
 UpgradeHelper::checkSetupFiles(str_replace('\\', '/', __DIR__).'/');
 // --- set DEFAULT_THEME and restart if needed -------------------------------------------
-if (isset($oReg->DefaultTheme) && $oReg->DefaultTheme != 'WbTheme') {
+if (isset($oReg->DefaultTheme) && trim($oReg->DefaultTheme, '/') != 'WbTheme') {
     db_update_key_value('settings', 'default_theme', 'WbTheme');
     $sLocation = 'Location: '.$oReg->AppUrl.basename(__FILE__);
     header($sLocation);
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 2099)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 2100)
@@ -51,5 +51,5 @@
 
 // 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.4');
-if(!defined('REVISION')) define('REVISION', '2099');
+if(!defined('REVISION')) define('REVISION', '2100');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/admin/users/user_list.php
===================================================================
--- branches/2.8.x/wb/admin/users/user_list.php	(revision 2099)
+++ branches/2.8.x/wb/admin/users/user_list.php	(revision 2100)
@@ -29,6 +29,7 @@
         $oReg = WbAdaptor::getInstance();
 		$oDb = WbDatabase::getInstance();
 		$oTrans = Translate::getInstance();
+        $oTrans->enableAddon('admin\\users');
 
         $iUserStatus = (($admin->get_get('status') == 1) ? 0 : 1);
         unset($_GET);
@@ -179,7 +180,7 @@
 
         $oTpl->set_block('main_block', 'show_add_loginname_block', 'show_add_loginname');
 		$oTpl->set_block('main_block', 'show_change_group_list_block', 'show_change_group_list');
-        $oTpl->se_var($oTrans->getLangArray());
+        $oTpl->set_var($oTrans->getLangArray());
 		$oTpl->parse('show_change_group_list', '');
 //		$oTpl->parse('show_change_group_list', 'show_change_group_list_block', true);
 
@@ -261,7 +262,7 @@
         }
 
         // Include the WB functions file
-        if(!function_exists('directory_list')) { require($oReg->AppUrl.'framework/functions.php'); }
+        if(!function_exists('directory_list')) { require($oReg->AppPath.'framework/functions.php'); }
 
         // Add media folders to home folder list
         $oTpl->set_block('main_block', 'folder_list_block', 'folder_list');
Index: branches/2.8.x/wb/admin/users/delete.php
===================================================================
--- branches/2.8.x/wb/admin/users/delete.php	(revision 2099)
+++ branches/2.8.x/wb/admin/users/delete.php	(revision 2100)
@@ -27,6 +27,7 @@
 {
 	$oDb = WbDatabase::getInstance();
 	$oTrans = Translate::getInstance();
+    $oTrans->enableAddon('admin\\users');
     $aUserID = array();
     $bRetVal = false;