Merge pull request #3720 from milchakov/MAPSME-1660_incorrect_website_validation

[editor] incorrect website validation

1 files changed, 8 insertions, 3 deletions

diff --git a/indexer/editable_map_object.cpp b/indexer/editable_map_object.cpp
index 8bc08aebaa..164705edcf 100644
--- a/indexer/editable_map_object.cpp
+++ b/indexer/editable_map_object.cpp
@@ -320,9 +320,14 @@ bool EditableMapObject::ValidateWebsite(string const & site)
   if (site.empty())
     return true;
 
-  auto const dotPos = find(begin(site), end(site), '.');
-  // Site should contain at least one dot but not at the begining/and.
-  if (dotPos == end(site) || site.front() == '.' || site.back() == '.')
+  // Site should contain at least one dot but not at the begining/end.
+  if ('.' == site.front() || '.' == site.back())
+    return false;
+
+  if (string::npos == site.find("."))
+    return false;
+
+  if (string::npos != site.find(".."))
     return false;
 
   return true;