Merge branch 'master' into merge-from-master

Conflicts:
	ext/tag_list/theme.php
This commit is contained in:
jgen
2017-03-11 00:52:16 -08:00
4 changed files with 31 additions and 25 deletions

View File

@@ -228,6 +228,7 @@ class UploadTheme extends Themelet {
if(class_exists("ICOFileHandler")){$supported_ext .= " ico ani cur";}
if(class_exists("MP3FileHandler")){$supported_ext .= " mp3";}
if(class_exists("SVGFileHandler")){$supported_ext .= " svg";}
if(class_exists("VideoFileHandler")){$supported_ext .= " flv mp4 ogv webm m4v";}
$title = "Booru to " . $config->get_string('title');
// CA=0: Ask to use current or new tags | CA=1: Always use current tags | CA=2: Always use new tags
$html .= '<p><a href="javascript: