Fix archaic methods

This commit is contained in:
Romain Neutron
2011-12-07 19:53:01 +01:00
parent 1f5a13efe3
commit 6b8843813b

View File

@@ -292,7 +292,7 @@ class appbox extends base
public function forceUpgrade(Setup_Upgrade &$upgrader) public function forceUpgrade(Setup_Upgrade &$upgrader)
{ {
$upgrader->add_steps(8 + count($this->get_databoxes())); $upgrader->add_steps(7 + count($this->get_databoxes()));
$registry = $this->get_registry(); $registry = $this->get_registry();
@@ -322,18 +322,6 @@ class appbox extends base
$system_file->empty_directory(); $system_file->empty_directory();
$upgrader->add_steps_complete(1); $upgrader->add_steps_complete(1);
/**
* Step 4
*/
$upgrader->set_current_message(_('Purging directories'));
if (!is_dir($registry->get('GV_RootPath') . 'www/setup/.svn') && is_dir($registry->get('GV_RootPath') . 'www/setup/'))
{
$system_file = new system_file($registry->get('GV_RootPath') . 'www/setup/');
$system_file->empty_directory();
rmdir($system_file->getPathname());
}
$upgrader->add_steps_complete(1);
/** /**
* Step 5 * Step 5
*/ */