Index: /changelog
===================================================================
--- /changelog	(revision 7103)
+++ /changelog	(revision 7108)
@@ -139,4 +139,6 @@
 - Bugfix: Produktbild bei Auswahl aus Mediathek wird nur die ID ÃŒbergeben
 - Bugfix: Bug gefixt, bei dem die Seite "BestellÃŒbersicht" im Frontend nur Fehler ausgegeben hat
+- Bugfix: Anrede wird nach Ãnderung im Profil (Frontend) nicht dargestellt 
+- Bugfix: Speicherprobleme bei Profildaten (Frontend) 
 - Feature: Satolo Newsletter-Registrierung mittels Double-OptIn
 - Feature: Satolo Newsletter-Abonnenten in gewÃ€hlte Liste integrieren
Index: /mods/wpsg_mod_versandarten.class.php
===================================================================
--- /mods/wpsg_mod_versandarten.class.php	(revision 7103)
+++ /mods/wpsg_mod_versandarten.class.php	(revision 7108)
@@ -410,56 +410,63 @@
 		{ 
 			
-			$bOK = false;
-			
-			// Alle mÃ¶glichen Versandarten durchgehen und schauen ob es eine PLZ BeschrÃ€nkung gibt
-			foreach ($this->shop->arShipping as $shipping_key => $shipping)
-			{
-								
-				$bOKShipping = true;
-				
-				if (preg_match('/^'.$this->id.'_\d+/', $shipping_key))
-				{
-				
-					$va_id = preg_replace('/^'.$this->id.'_/', '', $shipping_key);				
-					$va = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_VA."` WHERE `id` = '".wpsg_q($va_id)."' ");
-					
-					$kosten_plz = @unserialize($va['kosten_plz']);
+			/* PrÃŒfung, ob arShipping != leer */
+			$bOK = true;
+			
+			if (!empty($this->shop->arShipping)) {
+			
+				$bOK = false;
+				
+				// Alle mÃ¶glichen Versandarten durchgehen und schauen ob es eine PLZ BeschrÃ€nkung gibt
+				foreach ($this->shop->arShipping as $shipping_key => $shipping)
+				{
 									
-					if (wpsg_isSizedInt($va['vz']) && wpsg_isSizedArray($kosten_plz)) 
-					{
-						
-						$arPLZ = $this->getDefinedPLZAreas($va['vz']);
-							
-						foreach ($arPLZ as $plz_index => $plz)
+					$bOKShipping = true;
+					
+					if (preg_match('/^'.$this->id.'_\d+/', $shipping_key))
+					{
+					
+						$va_id = preg_replace('/^'.$this->id.'_/', '', $shipping_key);				
+						$va = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_VA."` WHERE `id` = '".wpsg_q($va_id)."' ");
+						
+						$kosten_plz = @unserialize($va['kosten_plz']);
+										
+						if (wpsg_isSizedInt($va['vz']) && wpsg_isSizedArray($kosten_plz)) 
 						{
 							
-							$arPLZ = wpsg_trim(explode(',', $plz));
-							
-							if ($kosten_plz[$plz_index] === 'noshipping' && in_array($arCheckout['plz'], $arPLZ))
+							$arPLZ = $this->getDefinedPLZAreas($va['vz']);
+								
+							foreach ($arPLZ as $plz_index => $plz)
 							{
 								
-								$bOKShipping = false;
+								$arPLZ = wpsg_trim(explode(',', $plz));
 								
+								if ($kosten_plz[$plz_index] === 'noshipping' && in_array($arCheckout['plz'], $arPLZ))
+								{
+									
+									$bOKShipping = false;
+									
+								}
+														
 							}
-													
+							
 						}
 						
 					}
 					
-				}
-				
-				$bOK = $bOK || $bOKShipping;
-				
-				// Sobald eine Ok ist, kann ich aufhÃ¶ren zu schleifen :D
-				if ($bOK === true) break;
-				
-			}
-			
-			if ($bOK === false)
-			{
-							
-				$error = true;
-				$this->shop->addFrontendError(__('Ein Versand in dieses Postleitzahlengebiet ist nicht mÃ¶glich.'));
-											
+					$bOK = $bOK || $bOKShipping;
+					
+					// Sobald eine Ok ist, kann ich aufhÃ¶ren zu schleifen :D
+					if ($bOK === true) break;
+					
+				}
+				
+				if ($bOK === false)
+				{
+								
+					$error = true;
+					$this->shop->addFrontendError(__('Ein Versand in dieses Postleitzahlengebiet ist nicht mÃ¶glich.'));
+												
+				}
+				
 			}
 						
Index: /views/css/admin.css
===================================================================
--- /views/css/admin.css	(revision 7103)
+++ /views/css/admin.css	(revision 7108)
@@ -14,5 +14,4 @@
 #wpsg-bs nav.navbar { margin-right:20px; }
 #wpsg-bs nav.navbar li { margin-bottom:0px; }
-#wpsg-bs nav.navbar .active { margin-right:2px; }
 #wpsg-bs nav.navbar .glyphicon { margin-right:10px; }
 #wpsg-bs .wpsg-export,
@@ -86,4 +85,6 @@
 .wpsg-table-customer .wpsg_pic_col { text-align:center; }
 .wpsg-table-customer .wpsg_pic_col img { margin-bottom:5px; }
+.tom_customerdata_deletebutton .button-primary { float:right; right:5px; background:#ba0000; font-size:10px; border-color:#aa0018 #990000 #7d0101; text-shadow:0 -1px 1px #aa0018, 1px 0 1px #aa0018, 0 1px 1px #aa0018, -1px 0 1px #aa0018; box-shadow:0 1px 0 #990000; }
+.tom_customerdata_deletebutton .button-primary:hover { background:#aa0018; border-color:#aa0018; }
 
 /* Rechtstexte */
Index: /views/mods/mod_kundenverwaltung/profil.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/profil.phtml	(revision 7103)
+++ /views/mods/mod_kundenverwaltung/profil.phtml	(revision 7108)
@@ -135,10 +135,14 @@
 		<?php if ($this->view['pflicht']['anrede'] != '2') { ?>
 		<div class="wpsg_checkoutblock">		
-			<label for="wpsg_title"><?php echo __('Anrede', 'wpsg'); ?>
+			<label for="wpsg_title" class="wpsg_checkout"><?php echo __('Anrede', 'wpsg'); ?>
 			<?php if ($this->view['pflicht']['anrede'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:</label>
 			<select class="wpsg_checkout <?php echo ((in_array("title", (array)$this->view['error']))?'wpsg_error':''); ?>" id="wpsg_title" name="wpsg[profil][title]">
 				<option value="-1"><?php echo __('Bitte auswÃ€hlen', 'wpsg'); ?></option>
 				<?php $i=0; foreach (explode("|", $this->view['pflicht']['anrede_auswahl']) as $t) { ?>
-				<option value="<?php echo $i; /*wpsg_hspc($t);*/ $i++; ?>" <?php echo (($this->view['data']['title'] == $t)?'selected="selected"':''); ?>><?php echo $t; ?></option>
+					<?php /* <option value="<?php echo $i; $i++; ?>" <?php echo (($this->view['data']['title'] == $t)?'selected="selected"':''); ?>><?php echo $t; ?></option> */ ?>
+					<option value="<?php echo $i; /*wpsg_hspc($t);*/ ?>"
+						<?php if ($this->view['data']['title'] == $i) : echo 'selected="selected"'; endif; ?>>
+						<?php echo $t; $i++; ?>
+					</option>
 				<?php } ?>
 			</select>
