merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -323,6 +323,11 @@
{
$package->depends[$key]->need_update = true;
$package->package_srl .= ",". $dep->package_srl;
if($dep->path === '.')
{
Context::set('contain_core', TRUE);
}
}
else
{
@ -338,6 +343,11 @@
$package->need_update = version_compare($package->version, $installedPackage->current_version, ">");
}
Context::set("package", $package);
if($package->path === '.')
{
Context::set('contain_core', TRUE);
}
}
if(!$_SESSION['ftp_password'])
{