fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in victorsl/processmaker/PM-1752 (pull request #1729)

Browse Source 
PM-1752 "16829 Si el workspace esta mal escrito al llamar..." SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2015-03-23 20:27:03 -04:00
parent 7dffbf54cb e63cad216a
commit 924af747c2
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/src/Maveriks/WebApplication.php
View File

@@ -480,15 +480,21 @@ class WebApplication
define("PATH_TEMPORAL", PATH_C . "dynEditor/");
define("PATH_DB", PATH_DATA . "sites" . PATH_SEP);
\Bootstrap::LoadTranslationObject((defined("SYS_LANG"))? SYS_LANG : "en");
if (empty($workspace)) {
return true;
}
define("SYS_SYS", $workspace);
if (! file_exists( PATH_DB . SYS_SYS . "/db.php" )) {
throw new \Exception(\G::loadTranslation("ID_NOT_WORKSPACE"));
if (!file_exists(PATH_DB . SYS_SYS . PATH_SEP . "db.php")) {
$rest = new \Maveriks\Extension\Restler();
$rest->setMessage(new RestException(Api::STAT_APP_EXCEPTION, \G::LoadTranslation("ID_NOT_WORKSPACE")));
exit(0);
}
require_once (PATH_DB . SYS_SYS . "/db.php");
// defining constant for workspace shared directory
@@ -546,8 +552,6 @@ class WebApplication
\Propel::init(PATH_CONFIG . "databases.php");
\Bootstrap::LoadTranslationObject(defined( 'SYS_LANG' ) ? SYS_LANG : "en");
return true;
}
}