Merge branch 'master' of github.com:shish/shimmie2

This commit is contained in:
Shish 2012-03-25 04:12:31 +01:00
commit 893afe5b61

2
ext/alias_editor/main.php Executable file → Normal file
View File

@ -122,7 +122,7 @@ class AliasEditor extends Extension {
private function get_alias_csv(Database $database) { private function get_alias_csv(Database $database) {
$csv = ""; $csv = "";
$aliases = $database->get_pairs("SELECT oldtag, newtag FROM aliases"); $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";
} }