From 6ba826eb321ebeabb628f426ffc6c48525e1fb25 Mon Sep 17 00:00:00 2001 From: plegall Date: Fri, 19 Feb 2010 09:20:11 +0000 Subject: 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 --- include/ws_functions.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') 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'], -- cgit v1.2.3