diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-12 06:08:14 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-12 06:08:14 -0700 |
| commit | fcddeefa59e3db8ebc0b394b38e9aef2ddf00371 (patch) | |
| tree | 8ec935f1703c187f974b1dc243c403adb2d937a3 /modules/server_add/helpers/server_add_task.php | |
| parent | f369b8fabfdffe475464827d6225b2d4895aadb5 (diff) | |
| parent | 67c81087131e7ef3e4d50ac549bc58dcc98d8cef (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/server_add/helpers/server_add_task.php')
| -rw-r--r-- | modules/server_add/helpers/server_add_task.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/server_add/helpers/server_add_task.php b/modules/server_add/helpers/server_add_task.php index 98575915..0482b47c 100644 --- a/modules/server_add/helpers/server_add_task.php +++ b/modules/server_add/helpers/server_add_task.php @@ -56,11 +56,12 @@ class server_add_task_Core { } else { $extension = strtolower(substr(strrchr($name, '.'), 1)); $source_path = "$path{$file['path']}/$name"; + $title = item::convert_filename_to_title($name); if (in_array($extension, array("flv", "mp4"))) { - $movie = movie::create($parent, $source_path, $name, $name, + $movie = movie::create($parent, $source_path, $name, $title, null, user::active()->id); } else { - $photo = photo::create($parent, $source_path, $name, $name, + $photo = photo::create($parent, $source_path, $name, $title, null, user::active()->id); } } |