Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1668)
+++ branches/2.8.x/CHANGELOG	(revision 1669)
@@ -11,6 +11,8 @@
 ! = Update/Change
 ===============================================================================
 
+17 Apr-2012 Build 1669 Dietmar Woellbrink (Luisehahne)
+# little fixes in /admin/addons/reload.php
 17 Apr-2012 Build 1668 Dietmar Woellbrink (Luisehahne)
 ! settigs.php add fields dev_infos and page_icon_dir
 + add developer info to footer
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1668)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1669)
@@ -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', '1668');
+if(!defined('REVISION')) define('REVISION', '1669');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/admin/addons/reload.php
===================================================================
--- branches/2.8.x/wb/admin/addons/reload.php	(revision 1668)
+++ branches/2.8.x/wb/admin/addons/reload.php	(revision 1669)
@@ -20,8 +20,11 @@
 	function ReloadAddonLoop($sType)
 	{
 		global $database;
-		$database->query('DELETE FROM `'.TABLE_PREFIX.'addons` WHERE `type`=\''.$sType.'\'');
+		$sql = 'DELETE FROM `'.TABLE_PREFIX.'addons` WHERE `type`=\''.$sType.'\'';
 		try{
+			if(!$database->query($sql)) {
+				throw new Exception('database error');
+			}
 			$oIterator = new DirectoryIterator(WB_PATH.'/'.$sType.'s');
 			$_Function = 'load_'.$sType;
 			foreach ($oIterator as $oFileinfo) {
@@ -91,31 +94,18 @@
 			{
 				$aReloadType = (isset($_POST['reload']) && is_array($_POST['reload'])) ? $_POST['reload'] : array();
 				foreach($aReloadType as $sType) {
+					$sType = rtrim($sType, 's');
 					switch($sType) {
-						case 'modules':
-						// reload all modules
-							if(ReloadAddonLoop('module')) {
-								$aMsg[] = $MESSAGE['ADDON_MODULES_RELOADED'];
+						case 'module':
+						case 'template':
+						case 'language':
+						// reload all addons from given type
+							if(ReloadAddonLoop($sType)) {
+								$aMsg[] = $MESSAGE['ADDON_'.strtoupper($sType).'S_RELOADED'];
 							}else {
 								$aErrors[] = $MESSAGE['ADDON_ERROR_RELOAD'];
 							}
 							break;
-						case 'templates':
-						// reload all templates
-							if(ReloadAddonLoop('template')) {
-								$aMsg[] = $MESSAGE['ADDON_TEMPLATES_RELOADED'];
-							}else {
-								$aErrors[] = $MESSAGE['ADDON_ERROR_RELOAD'];
-							}
-							break;
-						case 'languages':
-						// reload all languages
-							if(ReloadAddonLoop('language')) {
-								$aMsg[] = $MESSAGE['ADDON_LANGUAGES_RELOADED'];
-							}else {
-								$aErrors[] = $MESSAGE['ADDON_ERROR_RELOAD'];
-							}
-							break;
 						default:
 							$aErrors[] = $MESSAGE['GENERIC_NOT_COMPARE'].' ['.$sType.']';
 							break;