Revision 2100
Added by darkviper almost 12 years ago
- fixes from rev.2098/99
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
=============================================================================== |
| 13 | 13 |
|
| 14 |
11 Feb-2014 Build 2100 Manuela v.d.Decken(DarkViper) |
|
| 15 |
# fixes from rev.2098/99 |
|
| 14 | 16 |
11 Feb-2014 Build 2099 Manuela v.d.Decken(DarkViper) |
| 15 | 17 |
# first fixes from rev.2098 |
| 16 | 18 |
11 Feb-2014 Build 2098 Manuela v.d.Decken(DarkViper) |
| branches/2.8.x/wb/upgrade-script.php | ||
|---|---|---|
| 87 | 87 |
$oReg = WbAdaptor::getInstance(); |
| 88 | 88 |
UpgradeHelper::checkSetupFiles(str_replace('\\', '/', __DIR__).'/');
|
| 89 | 89 |
// --- set DEFAULT_THEME and restart if needed ------------------------------------------- |
| 90 |
if (isset($oReg->DefaultTheme) && $oReg->DefaultTheme != 'WbTheme') {
|
|
| 90 |
if (isset($oReg->DefaultTheme) && trim($oReg->DefaultTheme, '/') != 'WbTheme') {
|
|
| 91 | 91 |
db_update_key_value('settings', 'default_theme', 'WbTheme');
|
| 92 | 92 |
$sLocation = 'Location: '.$oReg->AppUrl.basename(__FILE__); |
| 93 | 93 |
header($sLocation); |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 51 | 51 |
|
| 52 | 52 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 53 | 53 |
if(!defined('VERSION')) define('VERSION', '2.8.4');
|
| 54 |
if(!defined('REVISION')) define('REVISION', '2099');
|
|
| 54 |
if(!defined('REVISION')) define('REVISION', '2100');
|
|
| 55 | 55 |
if(!defined('SP')) define('SP', '');
|
| branches/2.8.x/wb/admin/users/user_list.php | ||
|---|---|---|
| 29 | 29 |
$oReg = WbAdaptor::getInstance(); |
| 30 | 30 |
$oDb = WbDatabase::getInstance(); |
| 31 | 31 |
$oTrans = Translate::getInstance(); |
| 32 |
$oTrans->enableAddon('admin\\users');
|
|
| 32 | 33 |
|
| 33 | 34 |
$iUserStatus = (($admin->get_get('status') == 1) ? 0 : 1);
|
| 34 | 35 |
unset($_GET); |
| ... | ... | |
| 179 | 180 |
|
| 180 | 181 |
$oTpl->set_block('main_block', 'show_add_loginname_block', 'show_add_loginname');
|
| 181 | 182 |
$oTpl->set_block('main_block', 'show_change_group_list_block', 'show_change_group_list');
|
| 182 |
$oTpl->se_var($oTrans->getLangArray()); |
|
| 183 |
$oTpl->set_var($oTrans->getLangArray());
|
|
| 183 | 184 |
$oTpl->parse('show_change_group_list', '');
|
| 184 | 185 |
// $oTpl->parse('show_change_group_list', 'show_change_group_list_block', true);
|
| 185 | 186 |
|
| ... | ... | |
| 261 | 262 |
} |
| 262 | 263 |
|
| 263 | 264 |
// Include the WB functions file |
| 264 |
if(!function_exists('directory_list')) { require($oReg->AppUrl.'framework/functions.php'); }
|
|
| 265 |
if(!function_exists('directory_list')) { require($oReg->AppPath.'framework/functions.php'); }
|
|
| 265 | 266 |
|
| 266 | 267 |
// Add media folders to home folder list |
| 267 | 268 |
$oTpl->set_block('main_block', 'folder_list_block', 'folder_list');
|
| branches/2.8.x/wb/admin/users/delete.php | ||
|---|---|---|
| 27 | 27 |
{
|
| 28 | 28 |
$oDb = WbDatabase::getInstance(); |
| 29 | 29 |
$oTrans = Translate::getInstance(); |
| 30 |
$oTrans->enableAddon('admin\\users');
|
|
| 30 | 31 |
$aUserID = array(); |
| 31 | 32 |
$bRetVal = false; |
| 32 | 33 |
|
Also available in: Unified diff