diff --git a/composer.json b/composer.json index a6c4689b5..42b89a111 100644 --- a/composer.json +++ b/composer.json @@ -57,6 +57,7 @@ "thirdparty/jsmin/jsmin.php", "thirdparty/libchart/classes/", "thirdparty/pear", + "thirdparty/html2ps_pdf", "thirdparty/phing", "rbac/engine/classes/" ], diff --git a/thirdparty/html2ps_pdf/classes/org/active-link/doc/PHPClass.php b/thirdparty/html2ps_pdf/classes/org/active-link/doc/PHPClass.php index 4795f39d2..efaff865f 100644 --- a/thirdparty/html2ps_pdf/classes/org/active-link/doc/PHPClass.php +++ b/thirdparty/html2ps_pdf/classes/org/active-link/doc/PHPClass.php @@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -import("org.active-link.doc.Method"); /** * PHPClass class provides a structural definition for a class diff --git a/workflow/engine/classes/class.reportTables.php b/workflow/engine/classes/class.reportTables.php index 55c759c2e..5674367f7 100644 --- a/workflow/engine/classes/class.reportTables.php +++ b/workflow/engine/classes/class.reportTables.php @@ -811,20 +811,12 @@ class ReportTables */ public function tableExist () { - /* - $bExists = true; - $oConnection = mysql_connect(DB_HOST, DB_USER, DB_PASS); - mysql_select_db(DB_NAME); - $oDataset = mysql_query('SELECT COUNT(*) FROM REPORT_TABLE') || ($bExists = false); - return $bExists; - */ $bExists = true; $sDataBase = 'database_' . strtolower( DB_ADAPTER ); - if (G::LoadSystemExist( $sDataBase )) { - $oDataBase = new database(); - $bExists = $oDataBase->reportTableExist(); - } + $oDataBase = new database(); + $bExists = $oDataBase->reportTableExist(); + return $bExists; }