Merged in paulis/processmaker/HOR-804 (pull request #4120)

HOR-804
This commit is contained in:
Julio Cesar Laura Avendaño
2016-04-20 12:35:48 -04:00
2 changed files with 10 additions and 2 deletions

View File

@@ -86,7 +86,15 @@ class Installer
*/
public function isset_site($name = "workflow")
{
return file_exists(PATH_DATA . "sites/" . $name);
$pathSites = PATH_DATA . 'sites/'. '*';
$directories = glob($pathSites, GLOB_ONLYDIR);
foreach ($directories as $directory){
$site = basename($directory);
if(strtolower($site) === strtolower($name)){
return true;
}
}
return false;
}
/**

View File

@@ -1563,7 +1563,7 @@ class workspaceTools
}
$workspace = new workspaceTools($workspaceName);
if ($workspace->workspaceExists()) {
if (Installer::isset_site($workspaceName)) {
if ($overwrite) {
if ($workspace->dbInfo['DB_NAME'] == $workspace->dbInfo['DB_RBAC_NAME']) {
$newDatabases = 1;