double underscore as tag separator

git-svn-id: file:///home/shish/svn/shimmie2/trunk@638 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2007-12-08 04:08:29 +00:00
parent 6d90231d50
commit c697694c13
2 changed files with 10 additions and 4 deletions

View file

@ -58,8 +58,11 @@ class ArchiveFileHandler extends Extension {
}
else {
$tmpfile = $fullpath;
$list .= "<br>".html_escape("$subdir/$filename (".str_replace("/", ",", $subdir).")...");
$error = $this->add_image($tmpfile, $filename, str_replace("/", " ", $subdir));
$tags = $subdir;
$tags = str_replace("/", " ", $tags);
$tags = str_replace("__", " ", $tags);
$list .= "<br>".html_escape("$subdir/$filename (".str_replace(" ", ",", $tags).")...");
$error = $this->add_image($tmpfile, $filename, $tags);
if(is_null($error)) {
$list .= "ok\n";
}

View file

@ -59,8 +59,11 @@ class BulkAdd extends Extension {
}
else {
$tmpfile = $fullpath;
$list .= "<br>".html_escape("$subdir/$filename (".str_replace("/", ",", $subdir).")...");
$error = $this->add_image($tmpfile, $filename, str_replace("/", " ", $subdir));
$tags = $subdir;
$tags = str_replace("/", " ", $tags);
$tags = str_replace("__", " ", $tags);
$list .= "<br>".html_escape("$subdir/$filename (".str_replace(" ", ",", $tags).")...");
$error = $this->add_image($tmpfile, $filename, $tags);
if(is_null($error)) {
$list .= "ok\n";
}