diff options
| author | plegall <plg@piwigo.org> | 2010-02-19 09:20:11 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2010-02-19 09:20:11 +0000 |
| commit | 6ba826eb321ebeabb628f426ffc6c48525e1fb25 (patch) | |
| tree | 53d7d4576fa9b18cb0d83fd78d3211663304b701 /include/ws_functions.inc.php | |
| parent | 9c5a2aee191419b11aeef672b97f40fdc04d24ae (diff) | |
merge r4910 from branch 2.0 to trunk
feature 967: optionnaly transmit the original filename to pwg.images.add. When
transmitted, it fills the images.file column.
git-svn-id: http://piwigo.org/svn/trunk@4911 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | include/ws_functions.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php index f94a386a0..edd6296b2 100644 --- a/include/ws_functions.inc.php +++ b/include/ws_functions.inc.php @@ -1244,7 +1244,7 @@ SELECT // database registration $insert = array( - 'file' => $filename_wo_ext.'.jpg', + 'file' => !empty($params['original_filename']) ? $params['original_filename'] : $filename_wo_ext.'.jpg', 'date_available' => $dbnow, 'tn_ext' => 'jpg', 'name' => $params['name'], |