Merge commit 'upstream/master'

Conflicts:

	modules/gallery/helpers/access.php

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 85f6d16e..5dd07935 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -53,10 +53,10 @@ class Tags_Controller extends REST_Controller {
 
     $form = tag::get_add_form($item);
     if ($form->validate()) {
-      foreach (split("[\,\ \;]", $form->add_tag->inputs["name"]->value) as $tag_name) {
+      foreach (split("[\,\;]", $form->add_tag->inputs["name"]->value) as $tag_name) {
         $tag_name = trim($tag_name);
         if ($tag_name) {
-          $tag = tag::add($item, $tag_name);
+          $tag = tag::add($item, str_replace(" ", ".", $tag_name));
         }
       }