Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1413)
+++ branches/2.8.x/CHANGELOG	(revision 1414)
@@ -11,6 +11,9 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.2 -------------------------------------
+23 Jan-2011 Build 1404 Dietmar Woellbrink (Luisehahne)
+# fix wrong error message in media
+! backend start warning if upgrade-script exists
 23 Jan-2011 Build 1413 Frank Heyne (FrankH)
 # Bugfix for Ticket 900
 23 Jan-2011 Build 1412 Werner v.d.Decken(DarkViper)
Index: branches/2.8.x/wb/admin/media/delete.php
===================================================================
--- branches/2.8.x/wb/admin/media/delete.php	(revision 1413)
+++ branches/2.8.x/wb/admin/media/delete.php	(revision 1414)
@@ -32,14 +32,14 @@
 
 // Check to see if it contains ..
 if (!check_media_path($directory)) {
-	$admin->print_header();
-	$admin->print_error($MESSAGE['MEDIA']['DOT_DOT_SLASH']);
+	// $admin->print_header();
+	$admin->print_error($MESSAGE['MEDIA']['DIR_DOT_DOT_SLASH'],WB_URL.'/admin/media/browse.php?dir=',false );
 }
 
 // Get the temp id
 $file_id = $admin->checkIDKEY('id', false, 'GET');
 if (!$file_id) {
-	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], WB_URL);
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], WB_URL,false);
 }
 
 // Get home folder not to show
Index: branches/2.8.x/wb/admin/start/index.php
===================================================================
--- branches/2.8.x/wb/admin/start/index.php	(revision 1413)
+++ branches/2.8.x/wb/admin/start/index.php	(revision 1414)
@@ -63,12 +63,15 @@
 	$template->set_var('DISPLAY_ADMINTOOLS', 'display:none;');
 }
 
+$msg = (file_exists(WB_PATH.'/install/')) ?  $MESSAGE['START']['INSTALL_DIR_EXISTS'] : '';
+$msg .= (file_exists(WB_PATH.'/upgrade-script.php')) ? '<br />'.'upgrade-script.php '.$TEXT['DELETE'] : '';
+
 // Check if installation directory still exists
-if(file_exists(WB_PATH.'/install/')) {
+if(file_exists(WB_PATH.'/install/') || file_exists(WB_PATH.'/upgrade-script.php') ) {
 	// Check if user is part of Adminstrators group
 	if(in_array(1, $admin->get_groups_id()))
     {
-		$template->set_var('WARNING', $MESSAGE['START']['INSTALL_DIR_EXISTS'].'<br />'.'upgrade-script.php '.$TEXT['DELETE']);
+		$template->set_var('WARNING', $msg );
 	} else {
 		$template->set_var('DISPLAY_WARNING', 'display:none;');
 	}
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1413)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1414)
@@ -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.2.RC5');
-if(!defined('REVISION')) define('REVISION', '1413');
+if(!defined('REVISION')) define('REVISION', '1414');
 
 ?>