Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1725)
+++ branches/2.8.x/CHANGELOG	(revision 1726)
@@ -13,6 +13,9 @@
 
 
 
+30 Aug-2012 Build 1726 Dietmar Woellbrink (Luisehahne)
+! change multi-dimensional arrays (variables) to similar arrays
+! change message if uploaded file exists
 30 Aug-2012 Build 1725 Dietmar Woellbrink (Luisehahne)
 + add missing preferences rights for sysadmin in install
 30 Aug-2012 Build 1724 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/media/upload.php
===================================================================
--- branches/2.8.x/wb/admin/media/upload.php	(revision 1725)
+++ branches/2.8.x/wb/admin/media/upload.php	(revision 1726)
@@ -3,16 +3,15 @@
  *
  * @category        admin
  * @package         media
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
+ * @author          Ryan Djurovich,WebsiteBaker Project
+ * @copyright       2009-2012, WebsiteBaker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 
@@ -48,7 +47,7 @@
 // Check to see if target contains ../
 if (!check_media_path($target, false))
 {
-	$admin->print_error($MESSAGE['MEDIA']['TARGET_DOT_DOT_SLASH'] );
+	$admin->print_error($MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] );
 }
 
 // Create relative path of the target location for the file
@@ -170,11 +169,16 @@
 unset($list);
 
 if($sum_files == 1) {
-	$admin->print_success($sum_files.' '.$MESSAGE['MEDIA']['SINGLE_UPLOADED'] );
+	$admin->print_success($sum_files.' '.$MESSAGE['MEDIA_SINGLE_UPLOADED'] );
 } elseif($sum_files > 1) {
-	$admin->print_success($sum_files.' '.$MESSAGE['MEDIA']['UPLOADED'] );
+	$admin->print_success($sum_files.' '.$MESSAGE['MEDIA_UPLOADED'] );
 } else {
-	$admin->print_error($MESSAGE['MEDIA_NO_FILE_UPLOADED'] );
+
+	if(file_exists($relative.$filename)) {
+    	$admin->print_error($MESSAGE['MEDIA_FILE_EXISTS'] );
+    } else {
+    	$admin->print_error($MESSAGE['MEDIA_NO_FILE_UPLOADED'] );
+    }
 }
 
 // Print admin

Property changes on: branches/2.8.x/wb/admin/media/upload.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+Date Id Revision URL
\ No newline at end of property
Index: branches/2.8.x/wb/admin/pages/intro2.php
===================================================================
--- branches/2.8.x/wb/admin/pages/intro2.php	(revision 1725)
+++ branches/2.8.x/wb/admin/pages/intro2.php	(revision 1726)
@@ -3,9 +3,8 @@
  *
  * @category        admin
  * @package         pages
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
+ * @author          Ryan Djurovich,WebsiteBaker Project
+ * @copyright       2009-2012, WebsiteBaker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
@@ -46,10 +45,10 @@
 	$admin->print_error($MESSAGE['PAGES_NOT_SAVED']);
 } else {
 	change_mode($filename);
-	$admin->print_success($MESSAGE['PAGES']['INTRO_SAVED']);
+	$admin->print_success($MESSAGE['PAGES_INTRO_SAVED']);
 }
 if(!is_writable($filename)) {
-	$admin->print_error($MESSAGE['PAGES']['INTRO_NOT_WRITABLE']);
+	$admin->print_error($MESSAGE['PAGES_INTRO_NOT_WRITABLE']);
 }
 
 // Print admin footer
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1725)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1726)
@@ -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.3');
-if(!defined('REVISION')) define('REVISION', '1725');
+if(!defined('REVISION')) define('REVISION', '1726');
 if(!defined('SP')) define('SP', '');