merging some changes from the upstream master branch

This commit is contained in:
Gustavo Cruz
2012-11-30 11:27:38 -04:00
35 changed files with 497 additions and 1312 deletions

View File

@@ -66,7 +66,7 @@ class PmBootstrap extends Bootstrap
// pm workflow classes (static load)
$this->autoloader->registerClass('System', PATH_CORE . 'classes/class.system');
$this->autoloader->registerClass('Services_JSON', PATH_THIRDPARTY .'pear/json/class.json');
//$this->autoloader->registerClass('Services_JSON', PATH_THIRDPARTY .'pear/json/class.json');
$this->autoloader->registerClass('Smarty', PATH_THIRDPARTY . 'smarty/libs/Smarty.class');
$this->autoloader->registerClass('Propel', PATH_THIRDPARTY . 'propel/Propel');