aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2014-04-05 19:33:48 +0000
committerrvelices <rv-github@modusoptimus.com>2014-04-05 19:33:48 +0000
commit1786cac8b0a55cd8a892a206236c3e377e213c7e (patch)
tree38e7627e58d76bf62687a5af902337e8f6bfde21
parent1f3f5ff73f505cbc6041ae213398d240f61d5a60 (diff)
when displaying iptc metadata, add a space between iptc keywords (if there are many, the html line is unbreakable)
git-svn-id: http://piwigo.org/svn/trunk@28089 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/functions_metadata.inc.php4
-rw-r--r--include/picture_metadata.inc.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/functions_metadata.inc.php b/include/functions_metadata.inc.php
index fc74e2aec..e19b82423 100644
--- a/include/functions_metadata.inc.php
+++ b/include/functions_metadata.inc.php
@@ -33,7 +33,7 @@
* @param array $map
* @return array
*/
-function get_iptc_data($filename, $map)
+function get_iptc_data($filename, $map, $array_sep=',')
{
global $conf;
@@ -57,7 +57,7 @@ function get_iptc_data($filename, $map)
{
if ($iptc_key == '2#025')
{
- $value = implode(',',
+ $value = implode($array_sep,
array_map('clean_iptc_value',$iptc[$iptc_key]));
}
else
diff --git a/include/picture_metadata.inc.php b/include/picture_metadata.inc.php
index 0e9284246..0df50dfbf 100644
--- a/include/picture_metadata.inc.php
+++ b/include/picture_metadata.inc.php
@@ -79,7 +79,7 @@ if (($conf['show_exif']) and (function_exists('read_exif_data')))
if ($conf['show_iptc'])
{
- $iptc = get_iptc_data($picture['current']['src_image']->get_path(), $conf['show_iptc_mapping']);
+ $iptc = get_iptc_data($picture['current']['src_image']->get_path(), $conf['show_iptc_mapping'], ', ');
if (count($iptc) > 0)
{