Index: /mods/wpsg_mod_productvariants.class.php
===================================================================
--- /mods/wpsg_mod_productvariants.class.php	(revision 6239)
+++ /mods/wpsg_mod_productvariants.class.php	(revision 6241)
@@ -302,4 +302,17 @@
             //foreach ($form_data['wpsg_mod_productvariants'] as $var_id => $vari_id) $form_data['wpsg_mod_productvariants'][$var_id] = $var_id.':'.$vari_id;
             //$product_key = 'pv_'.$product_id.'|'.implode('|', $form_data['wpsg_mod_productvariants']);            
+<<<<<<< .mine
+
+        	if (!wpsg_isSizedArray($form_data['wpsg_vp'])) return false;
+        	
+        	foreach ($form_data['wpsg_vp'] as $var_id => $vari_id) $form_data['wpsg_vp'][$var_id] = $var_id.':'.$vari_id;
+        	$product_key = 'pv_'.$product_id.'|'.implode('|', $form_data['wpsg_vp']);
+||||||| .r6234
+
+        	if (!wpsg_isSizedArray($form_data['wpsg_vp'])) return false;
+        	
+        	foreach ($form_data['wpsg_vp'] as $var_id => $vari_id) $form_data['wpsg_mod_productvariants'][$var_id] = $var_id.':'.$vari_id;
+        	$product_key = 'pv_'.$product_id.'|'.implode('|', $form_data['wpsg_mod_productvariants']);
+=======
 			
         	if (!wpsg_isSizedArray($form_data['wpsg_mod_productvariants'])) return false;
@@ -307,4 +320,5 @@
         	foreach ($form_data['wpsg_mod_productvariants'] as $var_id => $vari_id) $form_data['wpsg_mod_productvariants'][$var_id] = $var_id.':'.$vari_id;
         	$product_key = 'pv_'.$product_id.'|'.implode('|', $form_data['wpsg_mod_productvariants']);
+>>>>>>> .r6240
         	     
         } // public function getProductKeyFromRequest($product_id, $form_data)
@@ -1074,7 +1088,14 @@
 		{
 
+<<<<<<< .mine
+			// Siehe productTemplate V4
+			//die("Veralteter Aufruf");
+			
+||||||| .r6234
+=======
 			// Siehe productTemplate V4
 			die("Veralteter Aufruf");
 			
+>>>>>>> .r6240
 			$produkt_id = $this->shop->getProduktId($product_key);
 			$produkt_data = $this->shop->cache->loadProduct($produkt_id);
Index: /views/mods/mod_productvariants/produkt.phtml
===================================================================
--- /views/mods/mod_productvariants/produkt.phtml	(revision 6239)
+++ /views/mods/mod_productvariants/produkt.phtml	(revision 6241)
@@ -5,6 +5,12 @@
 	 */
  
+<<<<<<< .mine
+	//die("Veraltet");
+
+||||||| .r6234
+=======
 	die("Veraltet");
 
+>>>>>>> .r6240
 ?>
  
@@ -55,5 +61,5 @@
 										<?php if (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0) { ?>
 										
-											<option value="<?php echo $kv; ?>" <?php echo ((wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$j]) == $kv)?'selected="selected"':''); ?>>						
+											<option value="<?php echo $kv; ?>" <?php echo ((wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$k]) == $kv)?'selected="selected"':''); ?>>						
 											<?php echo $vari['name']; ?>
 												
@@ -186,41 +192,4 @@
                     <?php } /* Radio ENDE */ ?>
 
-					<?php /* Checkboxen START */ ?>
-					<?php if ($var['typ'] == "checkbox" && $var['active'] == 1) { ?>
-					<label>
-						<input onchange="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="hidden" value="0" name="wpsg_vp[<?php echo $k; ?>]" />
-						<input <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == '1')?'checked="checked"':''); ?> onchange="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="checkbox" value="1" name="wpsg_vp[<?php echo $k; ?>]" />
-						<?php /* Abfrage Preisanzeige nur fÃŒr eingeloggte Benutzer START */?>
-						<?php if (($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?>
-							<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($var['price']))) { ?>
-								<span class="wpsg_vp_vari_preisinfo">(<?php echo wpsg_ff($var['price'], $this->get_option('wpsg_currency')); ?>)</span>
-							<?php } ?>
-						<?php } else {?>
-							<?php echo wpsg_translate(__('(Preise nur fÃŒr eingeloggte Benutzer)', 'wpsg')); ?>
-						<?php } ?>
-						<?php /* Abfrage ENDE */ ?>
-
-						<?php if ($this->get_option("wpsg_vp_showpic") == "1" && $var['showpic'] != false) { ?>
-						<span class="wpsg_vp_field_image">
-
-							<?php
-							/*
-							$img_src = $this->callMod('wpsg_mod_produktbilder', 'makeTn', array(
-								$this->getProduktId($this->view['data']['id']),
-								$var['showpic'],
-								$this->get_option("wpsg_vp_showpic_width"),
-								$this->get_option("wpsg_vp_showpic_height"),
-								's'
-							));
-							*/
-							$pbw = $this->get_option("wpsg_vp_showpic_width");
-							$pbh = $this->get_option("wpsg_vp_showpic_height");
-							$img_src = $vari['guid'];
-							?><img src="<?php echo $img_src; ?>" width="<?php echo $pbw; ?>" height="<?php echo $pbh; ?>" alt="" />
-														
-						</span>
-						<?php } ?>
-					</label>
-					<?php } /* Checkboxen ENDE */ ?>
 
 				    <div style="clear:both;"></div>
Index: /views/produkttemplates/standard.phtml
===================================================================
--- /views/produkttemplates/standard.phtml	(revision 6239)
+++ /views/produkttemplates/standard.phtml	(revision 6241)
@@ -205,4 +205,5 @@
 					<div class="wpsg_produkt_varianten">
 						<?php echo $this->callMod('wpsg_mod_productvariants', 'renderTemplate', array($this->view['data']['product_key'])); ?>
+						<?php //echo $this->callMod('wpsg_mod_productvariants', 'productTemplate', array($this->view['data'])); ?>
 					</div>
 					<?php /* Varianten ENDE */ ?>