Changeset 31097 for trunk/admin/include/functions_metadata.php
- Timestamp:
- Apr 21, 2015, 2:07:14 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/include/functions_metadata.php
r26946 r31097 69 69 if (isset($iptc['keywords'])) 70 70 { 71 // official keywords separator is the comma 72 $iptc['keywords'] = preg_replace('/[.;]/', ',', $iptc['keywords']); 73 $iptc['keywords'] = preg_replace('/,+/', ',', $iptc['keywords']); 74 $iptc['keywords'] = preg_replace('/^,+|,+$/', '', $iptc['keywords']); 75 76 $iptc['keywords'] = implode( 77 ',', 78 array_unique( 79 explode( 80 ',', 81 $iptc['keywords'] 82 ) 83 ) 84 ); 71 $iptc['keywords'] = metadata_normalize_keywords_string($iptc['keywords']); 85 72 } 86 73 … … 123 110 } 124 111 } 112 113 if (in_array($pwg_key, array('keywords', 'tags'))) 114 { 115 $exif[$pwg_key] = metadata_normalize_keywords_string($exif[$pwg_key]); 116 } 117 125 118 $exif[$pwg_key] = addslashes($exif[$pwg_key]); 126 119 } … … 352 345 } 353 346 347 /** 348 * Returns the list of keywords (future tags) correctly separated with 349 * commas. Other separators are converted into commas. 350 * 351 * @param string $keywords_string 352 * @return string 353 */ 354 function metadata_normalize_keywords_string($keywords_string) 355 { 356 global $conf; 357 358 $keywords_string = preg_replace($conf['metadata_keyword_separator_regex'], ',', $keywords_string); 359 $keywords_string = preg_replace('/,+/', ',', $keywords_string); 360 $keywords_string = preg_replace('/^,+|,+$/', '', $keywords_string); 361 362 $keywords_string = implode( 363 ',', 364 array_unique( 365 explode( 366 ',', 367 $keywords_string 368 ) 369 ) 370 ); 371 372 return $keywords_string; 373 } 354 374 ?>
Note: See TracChangeset
for help on using the changeset viewer.