aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2006-04-05 18:02:10 +0000
committerplegall <plg@piwigo.org>2006-04-05 18:02:10 +0000
commitcf5f9f4eb6ff84813db69bcd5aede7bd690f3ca7 (patch)
treed81abb79e525cead28ef0f453174565565fb4b2e /admin
parent3f17257804ab5346f9021819abb54996bdb28abb (diff)
typo fixed: forgotten a "$" on $tags_of array when calling set_tags_of.
modification: "." and ";" are also supported as IPTC keywords separator. git-svn-id: http://piwigo.org/svn/trunk@1127 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/include/functions_metadata.php14
1 files changed, 8 insertions, 6 deletions
diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php
index d4324a763..1df03ba43 100644
--- a/admin/include/functions_metadata.php
+++ b/admin/include/functions_metadata.php
@@ -50,7 +50,8 @@ function get_sync_iptc_data($file)
if (isset($iptc['keywords']))
{
- // keywords separator is the comma
+ // official keywords separator is the comma
+ $iptc['keywords'] = preg_replace('/[.;]/', ',', $iptc['keywords']);
$iptc['keywords'] = preg_replace('/^,+|,+$/', '', $iptc['keywords']);
}
@@ -180,16 +181,17 @@ function update_metadata($files)
);
}
- $fields =
+ mass_updates(
+ IMAGES_TABLE,
array(
'primary' => array('id'),
'update' => array_unique($update_fields)
- );
- echo '<pre>'; print_r($datas); echo '</pre>';
- mass_updates(IMAGES_TABLE, $fields, $datas);
+ ),
+ $datas
+ );
}
- set_tags_of(tags_of);
+ set_tags_of($tags_of);
}
/**