put the cleanup back

libraries/src/Table/Content.php

@@ -17,6 +17,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 
 /**
  * Content table
@@ -271,6 +272,36 @@ public function check()
 			$this->modified = $this->_db->getNullDate();
 		}
 
+		// Clean up keywords -- eliminate extra spaces between phrases
+		// and cr (\r) and lf (\n) characters from string
+		if (!empty($this->metakey))
+		{
+			// Only process if not empty
+
+			// Array of characters to remove
+			$bad_characters = array("\n", "\r", "\"", '<', '>');
+
+			// Remove bad characters
+			$after_clean = StringHelper::str_ireplace($bad_characters, '', $this->metakey);
+
+			// Create array using commas as delimiter
+			$keys = explode(',', $after_clean);
+
+			$clean_keys = array();
+
+			foreach ($keys as $key)
+			{
+				if (trim($key))
+				{
+					// Ignore blank keywords
+					$clean_keys[] = trim($key);
+				}
+			}
+
+			// Put array back together delimited by ", "
+			$this->metakey = implode(', ', $clean_keys);
+		}
+
 		return true;
 	}
 

libraries/src/Table/CoreContent.php

@@ -16,6 +16,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -144,6 +145,36 @@ public function check()
 			$this->core_publish_down = $temp;
 		}
 
+		// Clean up keywords -- eliminate extra spaces between phrases
+		// and cr (\r) and lf (\n) characters from string
+		if (!empty($this->core_metakey))
+		{
+			// Only process if not empty
+
+			// Array of characters to remove
+			$bad_characters = array("\n", "\r", "\"", '<', '>');
+
+			// Remove bad characters
+			$after_clean = StringHelper::str_ireplace($bad_characters, '', $this->core_metakey);
+
+			// Create array using commas as delimiter
+			$keys = explode(',', $after_clean);
+
+			$clean_keys = array();
+
+			foreach ($keys as $key)
+			{
+				if (trim($key))
+				{
+					// Ignore blank keywords
+					$clean_keys[] = trim($key);
+				}
+			}
+
+			// Put array back together delimited by ", "
+			$this->core_metakey = implode(', ', $clean_keys);
+		}
+
 		return true;
 	}