Merged stable 1.0 branch into trunk.

This commit is contained in:
Alexis Lahouze 2011-07-29 19:04:47 +00:00
parent 6de665ceb5
commit 7a05dfdee4
2 changed files with 2 additions and 1 deletions

View File

@ -877,7 +877,7 @@ class m_dom {
}
if (! is_null($type_old )) { // It's not a creation, it's an edit. Delete the old one
$db->query("update sub_domaines set web_action='DELETE' where domaine='$dom' and sub='$sub' and upper(type)=upper('$type_old') and valeur='$value_old';");
$db->query("update sub_domaines set web_action='DELETE' where domaine='$dom' and sub='$sub_old' and upper(type)=upper('$type_old') and valeur='$value_old';");
}
// Re-create the one we want

View File

@ -252,6 +252,7 @@ class m_mysql {
$login=$db->f("login");
// Ok, database exists and dbname is compliant. Let's proceed
$db->query("DELETE FROM size_db WHERE db='$dbname';");
$db->query("DELETE FROM db WHERE uid='$cuid' AND db='$dbname';");
$this->dbus->query("DROP DATABASE `$dbname`;");
$db->query("SELECT COUNT(*) AS cnt FROM db WHERE uid='$cuid';");