Index: /wpshopgermany.php
===================================================================
--- /wpshopgermany.php	(revision 6320)
+++ /wpshopgermany.php	(revision 6321)
@@ -12,6 +12,4 @@
 	*/
  
-	//error_reporting(E_ALL); ini_set("display_errors", "1");
-
 	define('WPSG_VERSION', '9.9.9');
 
@@ -64,11 +62,5 @@
  	define('WPSG_TBL_SCALEPRICE', $prefix.'wpsg_scaleprice');
  	define('WPSG_TBL_DELIVERYNOTE', $prefix.'wpsg_deliverynote');
-	
-	// WPML Tabellen
-	define('WPSG_TBL_WPML_ICL_STRINGS', $prefix.'icl_strings');
-	define('WPSG_TBL_WPML_ICL_STRING_PAGES', $prefix.'icl_string_pages');
-	define('WPSG_TBL_WPML_ICL_STRING_POSITIONS', $prefix.'icl_string_positions');
-	define('WPSG_TBL_WPML_ICL_STRING_TRANSLATIONS', $prefix.'icl_string_translations');
-
+		
 	// Slug
  	define('WPSG_FOLDERNAME', basename(dirname(__FILE__)));
@@ -111,7 +103,4 @@
 	define('WPSG_NETTO', '1');
 	
-	// Wird fÃŒr die Sharif ÜberprÃŒfung im Produkttemplate eingebunden
-	if (!function_exists('is_plugin_active')) require_once(ABSPATH.'/wp-admin/includes/plugin.php');
-
 	require_once(dirname(__FILE__).'/lib/functions.inc.php');
 	require_once(dirname(__FILE__).'/lib/filter_functions.inc.php');
@@ -122,6 +111,6 @@
 	require_once(dirname(__FILE__).'/lib/wpsg_header.class.php');
 	require_once(dirname(__FILE__).'/lib/wpsg_remoteconnection.class.php');
-	require_once(dirname(__FILE__).'/lib/wpsg_exceptionhandler.class.php');
-	require_once(dirname(__FILE__).'/model/wpsg_exception.class.php');
+	//require_once(dirname(__FILE__).'/lib/wpsg_exceptionhandler.class.php');
+	//require_once(dirname(__FILE__).'/model/wpsg_exception.class.php');
 	require_once(dirname(__FILE__).'/model/wpsg_model.class.php');
 	require_once(dirname(__FILE__).'/model/wpsg_product.class.php');
@@ -138,5 +127,8 @@
 	require_once(dirname(__FILE__).'/controller/wpsg_BasketController.class.php');
 	require_once(dirname(__FILE__).'/controller/wpsg_OrderController.class.php');
-	
+		
+	//set_exception_handler(array('\\wpsg\\exceptionhandler', 'exception'));
+	//throw new wpsg\Exception(\wpsg\Exception::TYP_DB, "TEST");
+
 	$_GET['wpsg_quotecheck'] = '\"CHECK';
 	
@@ -146,8 +138,5 @@
 	/** @var wpsg_ShopController */
 	$GLOBALS['wpsg_sc'] = new wpsg_ShopController();
-	
-	// Nicht behandelte Exceptions werden hier verarbeitet
-	set_exception_handler(array('\\wpsg\\exceptionhandler', 'exception'));
-	
+			
 	if ($GLOBALS['wpsg_sc']->isMultiBlog() && !is_admin() && $GLOBALS['wpsg_sc']->get_option('wpsg_multiblog_sessionPath', true) == '1')
 	{