Merge pull request #68 from Crizz0/issue/67

Fix handling of html-tags in ToU and PP
phpbb · Nov 10, 2020 · f4c5e09 · f4c5e09
2 parents ccb1aa5 + 75d8bde
commit f4c5e09
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Phpbb/TranslationValidator/Validator/LangKeyValidator.php b/src/Phpbb/TranslationValidator/Validator/LangKeyValidator.php
@@ -606,10 +606,10 @@ public function validateHtml($file, $key, $sourceString, $originString)
 			'SUPPORT_BODY',
 			'UPDATE_INSTALLATION_EXPLAIN',
 			'OVERVIEW_BODY',
-		)) || $this->originLanguagePath . 'ucp.php' === $file && in_array($key, array(
+		)) || ($this->phpbbVersion == '3.2' && ($this->originLanguagePath . 'ucp.php' === $file && in_array($key, array( //Check for 3.2
 			'TERMS_OF_USE_CONTENT',
 			'PRIVACY_POLICY',
-		)))
+		)))))
 		{
 			$sourceString = '<p>' . $sourceString . '</p>';
 			$originString = '<p>' . $originString . '</p>';
@@ -716,6 +716,11 @@ public function validateHtml($file, $key, $sourceString, $originString)
 					}
 				}
 
+				if ($this->originLanguagePath . 'ucp.php' === $file && in_array($key, array('TERMS_OF_USE_CONTENT', 'PRIVACY_POLICY')) && ($this->phpbbVersion != '3.2'))
+				{
+					$level = Output::ERROR;
+				}
+
 				$this->output->addMessage($level, 'String is using additional html: ' . $possibleHtml, $file, $key);
 			}
 		}