seo_cleanup: remove some duplicates and improve hyphen replacements #…

…1174
zenphoto · Sep 30, 2018 · d124977 · d124977
1 parent 336fc68
commit d124977
Showing 1 changed file with 2 additions and 15 deletions.
diff --git a/zp-core/zp-extensions/seo_zenphoto.php b/zp-core/zp-extensions/seo_zenphoto.php
@@ -77,7 +77,6 @@ function handleOption($option, $currentValue) {
 					"Ẳ"	 => "A",
 					"Ẵ"	 => "A",
 					"Ặ"	 => "A",
-					"Å"	 => "A",
 					"Ä"	 => "AE",
 					"Æ"	 => "AE",
 					"Ǽ"	 => "AE",
@@ -165,7 +164,6 @@ function handleOption($option, $currentValue) {
 					"Į"	 => "I",
 					"Ȋ"	 => "I",
 					"Ḭ"	 => "I",
-					"Ḭ"	 => "I",
 					"Ɨ"	 => "I",
 					"Ḯ"	 => "I",
 					"Ĵ"	 => "J",
@@ -177,7 +175,6 @@ function handleOption($option, $currentValue) {
 					"Ķ"	 => "K",
 					"Ḻ"	 => "L",
 					"Ḷ"	 => "L",
-					"Ḷ"	 => "L",
 					"Ļ"	 => "L",
 					"Ḽ"	 => "L",
 					"Ľ"	 => "L",
@@ -230,7 +227,6 @@ function handleOption($option, $currentValue) {
 					"Ǭ"	 => "O",
 					"Ộ"	 => "O",
 					"Ɔ"	 => "O",
-					"Ø"	 => "OE",
 					"Ǿ"	 => "OE",
 					"Œ"	 => "OE",
 					"Ṕ"	 => "P",
@@ -576,7 +572,6 @@ function handleOption($option, $currentValue) {
 					"ǖ"	 => "u",
 					"ǜ"	 => "u",
 					"ǘ"	 => "u",
-					"ǖ"	 => "u",
 					"ǚ"	 => "u",
 					"ừ"	 => "u",
 					"ứ"	 => "u",
@@ -868,9 +863,6 @@ function handleOption($option, $currentValue) {
 					"ῥ"	 => "r",
 					"რ"	 => "r",
 					"Ῥ"	 => "R",
-					"ŕ"	 => "r",
-					"ř"	 => "r",
-					"ŗ"	 => "r",
 					"ს"	 => "s",
 					"შ"	 => "sh",
 					"ſ"	 => "ss",
@@ -879,9 +871,6 @@ function handleOption($option, $currentValue) {
 					"ც"	 => "ts",
 					"წ"	 => "ts",
 					"უ"	 => "u",
-					"ü"	 => "u",
-					"ü"	 => "u",
-					"Ü"	 => "Ue",
 					"ვ"	 => "v",
 					"ὐ"	 => "y",
 					"ὑ"	 => "y",
@@ -1086,7 +1075,7 @@ static function filter($string) {
 			$string = strtolower($string);
 		$string = preg_replace("/\s+/", "-", $string);
 		$string = preg_replace("/[^a-zA-Z0-9_.-]/", "-", $string);
-		$string = str_replace(array('---', '--'), '-', $string);
+		$string = preg_replace("/--+/", "-", $string);
 		return $string;
 	}
 
@@ -1121,6 +1110,4 @@ function seoFriendlyJS(fname) {
 		return $js;
 	}
 
-}
-
-?>
+}