Browse Source

Improved parsing of tags

Tobias Reich 10 years ago
parent
commit
92d894783e
2 changed files with 2 additions and 2 deletions
  1. 1 1
      assets/js/photo.js
  2. 1 1
      php/modules/Photo.php

+ 1 - 1
assets/js/photo.js

@@ -408,7 +408,7 @@ photo = {
 
 		// Parse tags
 		tags = tags.replace(/(\ ,\ )|(\ ,)|(,\ )|(,{1,}\ {0,})|(,$|^,)/g, ',');
-		tags = tags.replace(/,$|^,/g, '');
+		tags = tags.replace(/,$|^,|(\ ){0,}$/g, '');
 
 		if (visible.photo()) {
 			photo.json.tags = tags;

+ 1 - 1
php/modules/Photo.php

@@ -639,7 +639,7 @@ class Photo extends Module {
 
 		# Parse tags
 		$tags = preg_replace('/(\ ,\ )|(\ ,)|(,\ )|(,{1,}\ {0,})|(,$|^,)/', ',', $tags);
-		$tags = preg_replace('/,$|^,/', ',', $tags);
+		$tags = preg_replace('/,$|^,|(\ ){0,}$/', '', $tags);
 		if (strlen($tags)>1000) return false;
 
 		# Set tags