diff options
| author | Tristan Zur <tzur@webserver.ccwn.org> | 2015-06-14 00:31:48 +0200 |
|---|---|---|
| committer | Tristan Zur <tzur@webserver.ccwn.org> | 2015-06-14 00:31:48 +0200 |
| commit | 6d695f9f698592b323ed3e00e1b2f7f3d388bb3c (patch) | |
| tree | 86dbc521cb2c466e0ac2db731d1d534a21c9f27c | |
| parent | 44c9ccf1aba8af2797d15e8d145fb1c541a8450e (diff) | |
Added Tags to upload
| -rw-r--r-- | modules/html5_uploader/controllers/uploader.php | 1 | ||||
| -rw-r--r-- | modules/tag/helpers/tag_event.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/html5_uploader/controllers/uploader.php b/modules/html5_uploader/controllers/uploader.php index 8f839a0..fb00288 100644 --- a/modules/html5_uploader/controllers/uploader.php +++ b/modules/html5_uploader/controllers/uploader.php @@ -113,6 +113,7 @@ class Uploader_Controller extends Controller { $group = $form->group("add_photos") ->label(t("Add photos to %album_title", array("album_title" => html::purify($album->title)))); $group->input("files[]")->type("file")->multiple(); + $group->input("tags")->type("text")->label(t("Tags")); $form->input("FOO")->type("hidden")->label(sprintf("Es können mehrere Bilder auf einmal hochgeladen werden. Dies dauert allerdings etwas - ohne extra Ladebalken. Also Geduld bewahren. Max. upload size of all pictures: %.0f MB.", ini_get("upload_max_filesize"))); diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php index d62ae36..426c84c 100644 --- a/modules/tag/helpers/tag_event.php +++ b/modules/tag/helpers/tag_event.php @@ -135,9 +135,9 @@ class tag_event_Core { static function add_photos_form_completed($album, $form) { $group = $form->add_photos; - if (!is_object($group->uploadify)) { + /*if (!is_object($group->uploadify)) { return; - } + }*/ foreach (explode(",", $form->add_photos->tags->value) as $tag_name) { $tag_name = trim($tag_name); |