Revision 1414
Added by Dietmar almost 14 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
|
| 13 | 13 |
------------------------------------- 2.8.2 ------------------------------------- |
| 14 |
23 Jan-2011 Build 1404 Dietmar Woellbrink (Luisehahne) |
|
| 15 |
# fix wrong error message in media |
|
| 16 |
! backend start warning if upgrade-script exists |
|
| 14 | 17 |
23 Jan-2011 Build 1413 Frank Heyne (FrankH) |
| 15 | 18 |
# Bugfix for Ticket 900 |
| 16 | 19 |
23 Jan-2011 Build 1412 Werner v.d.Decken(DarkViper) |
| branches/2.8.x/wb/admin/media/delete.php | ||
|---|---|---|
| 32 | 32 |
|
| 33 | 33 |
// Check to see if it contains .. |
| 34 | 34 |
if (!check_media_path($directory)) {
|
| 35 |
$admin->print_header(); |
|
| 36 |
$admin->print_error($MESSAGE['MEDIA']['DOT_DOT_SLASH']);
|
|
| 35 |
// $admin->print_header();
|
|
| 36 |
$admin->print_error($MESSAGE['MEDIA']['DIR_DOT_DOT_SLASH'],WB_URL.'/admin/media/browse.php?dir=',false );
|
|
| 37 | 37 |
} |
| 38 | 38 |
|
| 39 | 39 |
// Get the temp id |
| 40 | 40 |
$file_id = $admin->checkIDKEY('id', false, 'GET');
|
| 41 | 41 |
if (!$file_id) {
|
| 42 |
$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], WB_URL); |
|
| 42 |
$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], WB_URL,false);
|
|
| 43 | 43 |
} |
| 44 | 44 |
|
| 45 | 45 |
// Get home folder not to show |
| branches/2.8.x/wb/admin/start/index.php | ||
|---|---|---|
| 63 | 63 |
$template->set_var('DISPLAY_ADMINTOOLS', 'display:none;');
|
| 64 | 64 |
} |
| 65 | 65 |
|
| 66 |
$msg = (file_exists(WB_PATH.'/install/')) ? $MESSAGE['START']['INSTALL_DIR_EXISTS'] : ''; |
|
| 67 |
$msg .= (file_exists(WB_PATH.'/upgrade-script.php')) ? '<br />'.'upgrade-script.php '.$TEXT['DELETE'] : ''; |
|
| 68 |
|
|
| 66 | 69 |
// Check if installation directory still exists |
| 67 |
if(file_exists(WB_PATH.'/install/')) {
|
|
| 70 |
if(file_exists(WB_PATH.'/install/') || file_exists(WB_PATH.'/upgrade-script.php') ) {
|
|
| 68 | 71 |
// Check if user is part of Adminstrators group |
| 69 | 72 |
if(in_array(1, $admin->get_groups_id())) |
| 70 | 73 |
{
|
| 71 |
$template->set_var('WARNING', $MESSAGE['START']['INSTALL_DIR_EXISTS'].'<br />'.'upgrade-script.php '.$TEXT['DELETE']);
|
|
| 74 |
$template->set_var('WARNING', $msg );
|
|
| 72 | 75 |
} else {
|
| 73 | 76 |
$template->set_var('DISPLAY_WARNING', 'display:none;');
|
| 74 | 77 |
} |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 52 | 52 |
|
| 53 | 53 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 54 | 54 |
if(!defined('VERSION')) define('VERSION', '2.8.2.RC5');
|
| 55 |
if(!defined('REVISION')) define('REVISION', '1413');
|
|
| 55 |
if(!defined('REVISION')) define('REVISION', '1414');
|
|
| 56 | 56 |
|
| 57 | 57 |
?> |
Also available in: Unified diff
fix wrong error message in media
backend start warning if upgrade-script exists