From b19c99c674435de30105d1bd190cbd4a54e3e4b3 Mon Sep 17 00:00:00 2001
From: SecretR <secretr@e107.org>
Date: Wed, 8 May 2013 12:25:43 +0300
Subject: [PATCH] Issue #247 - format news keywords before saving to the DB,
 improved meta keys formatting

---
 e107_admin/newspost.php       | 5 +++++
 e107_handlers/application.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index fd3c7cd95..c3a0470e2 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -699,6 +699,11 @@ class news_admin_ui extends e_admin_ui
 					$_POST['news_meta_description'] = $row['news_meta_description'];
 				}
 			}
+			else // on submit
+			{
+				if(!empty($_POST['news_meta_keywords'])) $_POST['news_meta_keywords'] = eHelper::formatMetaKeys($_POST['news_meta_keywords']);
+			}
+			
 		}	
 	}
 }
diff --git a/e107_handlers/application.php b/e107_handlers/application.php
index 5854dcc43..efef45c8f 100644
--- a/e107_handlers/application.php
+++ b/e107_handlers/application.php
@@ -4211,7 +4211,7 @@ class eHelper
 	public static function formatMetaKeys($keywordString)
 	{
 		$keywordString = preg_replace('/[^\w\pL\s\-.,+]/u', '', strip_tags(e107::getParser()->toHTML($keywordString, TRUE)));
-		return trim(preg_replace('/[\s]+,[\s]+/', ',', str_replace('_', ' ', $keywordString)));
+		return trim(preg_replace('/[\s]?,[\s]?/', ',', str_replace('_', ' ', $keywordString)));
 	}
 	
 	public static function formatMetaDescription($descrString)