[BUGFIX] Unnecessary p-tags added to info window

Author: mhirdes

Classes/Domain/Model/Address.php

@@ -473,7 +473,7 @@ public function setShadowHeight($shadowHeight) {
 	 * @return \string $infoWindowContent
 	 */
 	public function getInfoWindowContent() {
-		return preg_replace("/\r\n|\r/", '</p><p class="bodytext">', $this->infoWindowContent);
+		return $this->infoWindowContent;
 	}
 
 	/**

Classes/ViewHelpers/EscapeViewHelper.php

@@ -56,8 +56,7 @@ class EscapeViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelp
 	 */
 	public function render() {
 		$value = $this->renderChildren();
-		
-		return str_replace("'", "\'", $value);
+        return str_replace("'", "\'", preg_replace("/\r\n|\r|\n/", "", $value));
 	}
 }