From 45362f5bb59884ad15ae0e1366d16c7e665e8176 Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Wed, 28 May 2014 12:05:31 -0400 Subject: [PATCH 1/2] adding std object instance declaration to avoid warnings --- workflow/engine/classes/model/Translation.php | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/classes/model/Translation.php b/workflow/engine/classes/model/Translation.php index 16d3fa7d9..845c43197 100755 --- a/workflow/engine/classes/model/Translation.php +++ b/workflow/engine/classes/model/Translation.php @@ -125,6 +125,7 @@ class Translation extends BaseTranslation $rows[] = $rs->getRow(); } + $result = new StdClass(); $result->data = $rows; $result->totalCount = $totalCount; From 75199402e5dd9c39066fd639afa48dc9f776a562 Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Wed, 28 May 2014 12:08:00 -0400 Subject: [PATCH 2/2] updateing app.php to remove composer autoload use, and some little tweaks --- workflow/public_html/app.php | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/workflow/public_html/app.php b/workflow/public_html/app.php index c0134146c..c53e41c13 100644 --- a/workflow/public_html/app.php +++ b/workflow/public_html/app.php @@ -5,6 +5,10 @@ try { $rootDir = realpath(__DIR__ . "/../../") . DIRECTORY_SEPARATOR; + require $rootDir . "framework/src/Maveriks/Util/ClassLoader.php"; + $loader = Maveriks\Util\ClassLoader::getInstance(); + $loader->add($rootDir . 'framework/src/', "Maveriks"); + if (! is_dir($rootDir . 'vendor')) { if (file_exists($rootDir . 'composer.phar')) { throw new Exception( @@ -22,18 +26,6 @@ try { } } - if (! file_exists($rootDir . 'vendor' . DIRECTORY_SEPARATOR . "autoload.php")) { - throw new Exception( - "ERROR: Problems with Vendors!" . PHP_EOL . - "Please execute the following command to repair vendors:" .PHP_EOL.PHP_EOL. - "$>php composer.phar update" - ); - } - - require $rootDir . "framework/src/Maveriks/Util/ClassLoader.php"; - - $loader = Maveriks\Util\ClassLoader::getInstance(); - $loader->add($rootDir . 'framework/src/', "Maveriks"); $loader->add($rootDir . 'workflow/engine/src/', "ProcessMaker"); //$loader->add($rootDir . "workflow/engine/classes/model/"); $loader->add($rootDir . 'workflow/engine/src/');