james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

str_getcsv rather than explode, for handling quotes

Browse Source
This commit is contained in:
Shish 2015-01-30 03:53:58 +00:00
parent 0d2d7eedd7
commit 52dc36cfa6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/alias_editor/main.php
View File

@ -138,7 +138,7 @@ class AliasEditor extends Extension {
$csv = ""; $csv = "";
$aliases = $database->get_pairs("SELECT oldtag, newtag FROM aliases ORDER BY newtag"); $aliases = $database->get_pairs("SELECT oldtag, newtag FROM aliases ORDER BY newtag");
foreach($aliases as $old => $new) { foreach($aliases as $old => $new) {
$csv .= "$old,$new\n"; $csv .= "\"$old\",\"$new\"\n";
} }
return $csv; return $csv;
} }
@ -150,7 +150,7 @@ class AliasEditor extends Extension {
private function add_alias_csv(Database $database, /*string*/ $csv) { private function add_alias_csv(Database $database, /*string*/ $csv) {
$csv = str_replace("\r", "\n", $csv); $csv = str_replace("\r", "\n", $csv);
foreach(explode("\n", $csv) as $line) { foreach(explode("\n", $csv) as $line) {
$parts = explode(",", $line); $parts = str_getcsv($line);
if(count($parts) == 2) { if(count($parts) == 2) {
$pair = array("oldtag" => $parts[0], "newtag" => $parts[1]); $pair = array("oldtag" => $parts[0], "newtag" => $parts[1]);
if(!$database->get_row("SELECT * FROM aliases WHERE oldtag=:oldtag AND lower(newtag)=lower(:newtag)", $pair)){ if(!$database->get_row("SELECT * FROM aliases WHERE oldtag=:oldtag AND lower(newtag)=lower(:newtag)", $pair)){