This commit is contained in:
Ronald Quenta
2017-09-05 15:58:34 -04:00
parent 6e6786857c
commit 0be35ff34d
3 changed files with 250 additions and 295 deletions

View File

@@ -39,7 +39,6 @@
"monolog/monolog": "1.19.0", "monolog/monolog": "1.19.0",
"geshi/geshi": "dev-master", "geshi/geshi": "dev-master",
"libchart/libchart": "1.4.0", "libchart/libchart": "1.4.0",
"indeyets/pake": "1.99.*",
"phpmailer/phpmailer": "5.2.*", "phpmailer/phpmailer": "5.2.*",
"pear/archive_tar": "1.4.*", "pear/archive_tar": "1.4.*",
"pear/console_getopt": "1.4.*", "pear/console_getopt": "1.4.*",
@@ -80,6 +79,7 @@
"gulliver/includes/inc.ajax.php", "gulliver/includes/inc.ajax.php",
"gulliver/includes/smarty_plugins/function.pmos.php", "gulliver/includes/smarty_plugins/function.pmos.php",
"thirdparty/pear/PEAR.php", "thirdparty/pear/PEAR.php",
"thirdparty/pake/pakeFunction.php",
"thirdparty/HTMLPurifier/HTMLPurifier.auto.php", "thirdparty/HTMLPurifier/HTMLPurifier.auto.php",
"workflow/engine/classes/class.pmFunctions.php", "workflow/engine/classes/class.pmFunctions.php",
"workflow/engine/src/ProcessMaker/Util/helpers.php" "workflow/engine/src/ProcessMaker/Util/helpers.php"

523
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -71,10 +71,10 @@ abstract class DBAdapter {
* @return DBAdapter An instance of a Propel database adapter. * @return DBAdapter An instance of a Propel database adapter.
* @throws PropelException if the adapter could not be instantiated. * @throws PropelException if the adapter could not be instantiated.
*/ */
public static function factory($driver) { public static function factory($driver)
{
$adapterClass = isset(self::$adapters[$driver]) ? self::$adapters[$driver] : null; $adapterClass = isset(self::$adapters[$driver]) ? self::$adapters[$driver] : null;
if ($adapterClass !== null) { if ($adapterClass !== null) {
require_once 'propel/adapter/'.$adapterClass.'.php';
$a = new $adapterClass(); $a = new $adapterClass();
return $a; return $a;
} else { } else {