aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-03-30 21:25:32 +0000
committerplegall <plg@piwigo.org>2011-03-30 21:25:32 +0000
commit438e1252bdeec05370720b2ed62a21b209e2f0fc (patch)
tree7415a17a55a54220cdf63c4e27d824eed5aeb514 /include
parenta387525c08ed71b567e4e2aa02e3d40d82963603 (diff)
bug fixed: for metadata synchronization, use the same behavior in
pwg.images.addSimple as in pwg.images.add, ie the metadata mapping is prioritary compared to values given to the web API methods (author, description, title...) git-svn-id: http://piwigo.org/svn/trunk@9944 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/ws_functions.inc.php13
1 files changed, 13 insertions, 0 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index 849ff949e..5807a4cc1 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -1450,6 +1450,19 @@ SELECT id, name, permalink
$url_params['category'] = $category;
}
+ // update metadata from the uploaded file (exif/iptc), even if the sync
+ // was already performed by add_uploaded_file().
+ $query = '
+SELECT
+ path
+ FROM '.IMAGES_TABLE.'
+ WHERE id = '.$image_id.'
+;';
+ list($file_path) = pwg_db_fetch_row(pwg_query($query));
+
+ require_once(PHPWG_ROOT_PATH.'admin/include/functions_metadata.php');
+ update_metadata(array($image_id=>$file_path));
+
return array(
'image_id' => $image_id,
'url' => make_picture_url($url_params),