diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/history.php | 2 | ||||
| -rw-r--r-- | admin/include/functions_upload.inc.php | 2 | ||||
| -rw-r--r-- | admin/themes/default/template/photos_add_direct.tpl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/admin/history.php b/admin/history.php index c2d3ecb9a..40648e4f6 100644 --- a/admin/history.php +++ b/admin/history.php @@ -50,7 +50,7 @@ else $page['start'] = 0; } -$types = array('none', 'picture', 'high', 'other'); +$types = array_merge(array('none'), get_enums(HISTORY_TABLE, 'image_type')); $display_thumbnails = array('no_display_thumbnail' => l10n('No display'), 'display_thumbnail_classic' => l10n('Classic display'), diff --git a/admin/include/functions_upload.inc.php b/admin/include/functions_upload.inc.php index 17e78a200..900612fdd 100644 --- a/admin/include/functions_upload.inc.php +++ b/admin/include/functions_upload.inc.php @@ -535,7 +535,7 @@ function upload_file_video($representative_ext, $file_path) $ffmpeg_video_exts = array( // extensions tested with FFmpeg 'wmv','mov','mkv','mp4','mpg','flv','asf','xvid','divx','mpeg', - 'avi','rm', + 'avi','rm', 'm4v', 'ogg', 'ogv', 'webm', 'webmv', ); if (!in_array(strtolower(get_extension($file_path)), $ffmpeg_video_exts)) diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl index decd3e2b3..e9ea85473 100644 --- a/admin/themes/default/template/photos_add_direct.tpl +++ b/admin/themes/default/template/photos_add_direct.tpl @@ -21,7 +21,7 @@ {combine_script id='jquery.selectize' load='footer' path='themes/default/js/plugins/selectize.min.js'} {combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.{$themeconf.colorscheme}.css"} -{combine_script id='piecon' load='footer' path='themes/default/js/plugins/piecon.min.js'} +{combine_script id='piecon' load='footer' path='themes/default/js/plugins/piecon.js'} {footer_script} {* <!-- CATEGORIES --> *} |