aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2012-02-10 14:44:20 +0000
committermistic100 <mistic@piwigo.org>2012-02-10 14:44:20 +0000
commita25fe0c7e86da6c60b22b7785d27832f0bb18b2a (patch)
tree6fb4d1bb4b872d57c06005cb2c8f33ea0b341638 /admin
parent1a56352d0854adc604c4efd640297276e5ce37ce (diff)
feature 2567: in IMAGES_TABLE the field "name" is prefilled with the filename
git-svn-id: http://piwigo.org/svn/trunk@13082 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/include/functions_upload.inc.php4
-rw-r--r--admin/site_update.php1
2 files changed, 4 insertions, 1 deletions
diff --git a/admin/include/functions_upload.inc.php b/admin/include/functions_upload.inc.php
index 648b8ddc6..2a5206c1b 100644
--- a/admin/include/functions_upload.inc.php
+++ b/admin/include/functions_upload.inc.php
@@ -296,8 +296,10 @@ SELECT
else
{
// database registration
+ $file = pwg_db_real_escape_string(isset($original_filename) ? $original_filename : basename($file_path));
$insert = array(
- 'file' => pwg_db_real_escape_string(isset($original_filename) ? $original_filename : basename($file_path)),
+ 'file' => $file,
+ 'name' => get_name_from_file($file),
'date_available' => $dbnow,
'path' => preg_replace('#^'.preg_quote(PHPWG_ROOT_PATH).'#', '', $file_path),
'filesize' => $file_infos['filesize'],
diff --git a/admin/site_update.php b/admin/site_update.php
index ef73e0104..2021ac984 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -410,6 +410,7 @@ SELECT id, path
$insert = array(
'id' => $next_element_id++,
'file' => $filename,
+ 'name' => get_name_from_file($filename),
'date_available' => CURRENT_DATE,
'path' => $path,
'representative_ext' => $fs[$path]['representative_ext'],