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

BUG, Fix Circular references on rbac classes, this occurs on most new php versions.

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2014-04-28 12:42:14 -04:00
parent 194c67d371
commit cb8e2b7614
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ class WebApplication
*/ */
public function setRootDir($rootDir) public function setRootDir($rootDir)
{ {
$this->rootDir = $rootDir; $this->rootDir = rtrim($rootDir, DS);
$this->workflowDir = $rootDir . DS . "workflow" . DS; $this->workflowDir = $rootDir . DS . "workflow" . DS;
} }
@@ -160,7 +160,7 @@ class WebApplication
*/ */
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
require_once $this->rootDir . "framework/src/Maveriks/Extension/Restler/UploadFormat.php"; require_once $this->rootDir . "/framework/src/Maveriks/Extension/Restler/UploadFormat.php";
// $servicesDir contains directory where Services Classes are allocated // $servicesDir contains directory where Services Classes are allocated
$servicesDir = $this->workflowDir . 'engine' . DS . 'src' . DS . 'ProcessMaker' . DS . 'Services' . DS; $servicesDir = $this->workflowDir . 'engine' . DS . 'src' . DS . 'ProcessMaker' . DS . 'Services' . DS;
@@ -383,7 +383,7 @@ class WebApplication
PATH_RBAC_CORE . PATH_SEPARATOR . PATH_RBAC_CORE . PATH_SEPARATOR .
get_include_path() get_include_path()
); );
///print_r(get_include_path()); die;
/* /*
* Setting Up Workspace * Setting Up Workspace

4
rbac/engine/classes/model/RbacUsersPeer.php
View File

@@ -31,9 +31,9 @@
require_once 'classes/model/om/BaseRbacUsersPeer.php'; require_once 'classes/model/om/BaseRbacUsersPeer.php';
// include object class // include object class
include_once 'classes/model/RbacUsers.php'; //include_once 'classes/model/RbacUsers.php';
//die("----LAST --as");
/** /**
* Skeleton subclass for performing query and update operations on the 'USERS' table. * Skeleton subclass for performing query and update operations on the 'USERS' table.
* *

2
rbac/engine/classes/model/UsersRolesPeer.php
View File

@@ -30,7 +30,7 @@
require_once 'classes/model/om/BaseUsersRolesPeer.php'; require_once 'classes/model/om/BaseUsersRolesPeer.php';
// include object class // include object class
include_once 'classes/model/UsersRoles.php'; //include_once 'classes/model/UsersRoles.php';
/** /**

2
rbac/engine/classes/model/om/BaseRbacUsersPeer.php
View File

@@ -3,7 +3,7 @@
require_once 'propel/util/BasePeer.php'; require_once 'propel/util/BasePeer.php';
// The object class -- needed for instanceof checks in this class. // The object class -- needed for instanceof checks in this class.
// actual class may be a subclass -- as returned by RbacUsersPeer::getOMClass() // actual class may be a subclass -- as returned by RbacUsersPeer::getOMClass()
include_once 'classes/model/RbacUsers.php'; //include_once 'classes/model/RbacUsers.php';
/** /**
* Base static class for performing query and update operations on the 'USERS' table. * Base static class for performing query and update operations on the 'USERS' table.

2
rbac/engine/classes/model/om/BaseUsersRolesPeer.php
View File

@@ -3,7 +3,7 @@
require_once 'propel/util/BasePeer.php'; require_once 'propel/util/BasePeer.php';
// The object class -- needed for instanceof checks in this class. // The object class -- needed for instanceof checks in this class.
// actual class may be a subclass -- as returned by UsersRolesPeer::getOMClass() // actual class may be a subclass -- as returned by UsersRolesPeer::getOMClass()
include_once 'classes/model/UsersRoles.php'; //include_once 'classes/model/UsersRoles.php';
/** /**
* Base static class for performing query and update operations on the 'USERS_ROLES' table. * Base static class for performing query and update operations on the 'USERS_ROLES' table.