merge sandbox to trunk for 1.4.3.1

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7659 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2010-08-25 06:19:21 +00:00
parent 289973781a
commit 200d63636c
195 changed files with 8166 additions and 3576 deletions

View file

@ -171,11 +171,16 @@
}
if($oModel->getPackage($args->package_srl))
{
executeQuery("autoinstall.updatePackage", $args);
$output = executeQuery("autoinstall.updatePackage", $args);
}
else
{
executeQuery("autoinstall.insertPackage", $args);
$output = executeQuery("autoinstall.insertPackage", $args);
if(!$output->toBool())
{
$output = executeQuery("autoinstall.deletePackage", $args);
$output = executeQuery("autoinstall.insertPackage", $args);
}
}
}
}