From 5f1a55d06b4ae2c24cc44f90316aff840a9a8e93 Mon Sep 17 00:00:00 2001 From: Tim Andrews Date: Thu, 18 Jun 2020 22:44:31 -0400 Subject: [PATCH] added preserve_slashes functionality to cleanUpString, so we may have slashes in fractional ingredieents, issue # 262 --- lib/Service/RecipeService.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/Service/RecipeService.php b/lib/Service/RecipeService.php index 5005f182..1c140a6d 100755 --- a/lib/Service/RecipeService.php +++ b/lib/Service/RecipeService.php @@ -275,7 +275,7 @@ class RecipeService $ingredients = []; foreach ($json['recipeIngredient'] as $i => $ingredient) { - $ingredient = $this->cleanUpString($ingredient); + $ingredient = $this->cleanUpString($ingredient, false, true); if (!$ingredient) { continue; @@ -1142,7 +1142,7 @@ class RecipeService * * @return string */ - private function cleanUpString($str, $preserve_newlines = false) + private function cleanUpString($str, $preserve_newlines = false, $preserve_slashes = false) { if (!$str) { return ''; @@ -1154,8 +1154,13 @@ class RecipeService $str = str_replace(["\r", "\n"], '', $str); } - $str = str_replace(["\t", "\\", "/"], '', $str); - + if (!$preserve_slashes) { + $str = str_replace(["\t", "\\"], '', $str); + } + else { + $str = str_replace(["\t", "\\", "/"], '', $str); + } + $str = html_entity_decode($str); return $str;