Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1237)
+++ branches/2.8.x/CHANGELOG	(revision 1238)
@@ -12,6 +12,8 @@
 
 ------------------------------------- 2.8.1 -------------------------------------
 11-Jan-2010 Dietmar Woellbrink (Luisehahne)
+!	fix load_module, load_language (tks to Webbird)
+11-Jan-2010 Dietmar Woellbrink (Luisehahne)
 !	Ticket #904 fix if templatename is equal language
 11-Jan-2010 Dietmar Woellbrink (Luisehahne)
 !	Ticket #905 fix search.php 'registered' hardcoded
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1237)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1238)
@@ -2,7 +2,7 @@
 /****************************************************************************
 * SVN Version information:
 *
-* $Id: version.php 1236 2010-01-11 12:37:12Z Luisehahne $
+* $Id: version.php 1237 2010-01-11 12:37:12Z Luisehahne $
 *
 *
 *
@@ -56,7 +56,7 @@
  * @author       Ryan Djurovich
  * @copyright    2004-2009, Ryan Djurovich
  * @copyright    2009-2010, Website Baker Org. e.V.
- * @version      $Id: version.php 1236 2010-01-11 12:37:12Z Luisehahne $
+ * @version      $Id: version.php 1237 2010-01-11 12:37:12Z Luisehahne $
  * @platform     WebsiteBaker 2.8.x
  * @requirements >= PHP 4.3.4
  * @license      http://www.gnu.org/licenses/gpl.html
@@ -70,6 +70,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.1');
-if(!defined('REVISION')) define('REVISION', '1237');
+if(!defined('REVISION')) define('REVISION', '1238');
 
 ?>
\ No newline at end of file
Index: branches/2.8.x/wb/framework/functions.php
===================================================================
--- branches/2.8.x/wb/framework/functions.php	(revision 1237)
+++ branches/2.8.x/wb/framework/functions.php	(revision 1238)
@@ -851,7 +851,7 @@
 			if(!isset($module_function) AND isset($module_type)) { $module_function = $module_type; }
 			$module_function = strtolower($module_function);
 			// Check that it doesn't already exist
-			$result = $database->query("SELECT addon_id FROM ".TABLE_PREFIX."addons WHERE directory = '".$module_directory."' LIMIT 0,1");
+			$result = $database->query("SELECT addon_id FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND directory = '".$module_directory."' LIMIT 0,1");
 			if($result->numRows() == 0)
 			{
 				// Load into DB
@@ -904,7 +904,7 @@
 			if(!isset($language_license)) { $language_license = 'GNU General Public License'; }
 			if(!isset($language_platform) AND isset($language_designed_for)) { $language_platform = $language_designed_for; }
 			// Check that it doesn't already exist
-			$result = $database->query("SELECT addon_id FROM ".TABLE_PREFIX."addons WHERE directory = '".$language_code."' LIMIT 0,1");
+			$result = $database->query("SELECT addon_id FROM ".TABLE_PREFIX."addons WHERE type = 'language' AND directory = '".$language_code."' LIMIT 0,1");
 			if($result->numRows() == 0) {
 				// Load into DB
 				$query = "INSERT INTO ".TABLE_PREFIX."addons ".