Merged in bugfix/HOR-3619 (pull request #5847)

Path of third party, report tables, triggers

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
jonathan Quispe
2017-08-04 17:46:28 +00:00
committed by Paula Quispe
3 changed files with 4 additions and 12 deletions

View File

@@ -57,6 +57,7 @@
"thirdparty/jsmin/jsmin.php", "thirdparty/jsmin/jsmin.php",
"thirdparty/libchart/classes/", "thirdparty/libchart/classes/",
"thirdparty/pear", "thirdparty/pear",
"thirdparty/html2ps_pdf",
"thirdparty/phing", "thirdparty/phing",
"rbac/engine/classes/" "rbac/engine/classes/"
], ],

View File

@@ -22,7 +22,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 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 * PHPClass class provides a structural definition for a class

View File

@@ -811,20 +811,12 @@ class ReportTables
*/ */
public function tableExist () 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; $bExists = true;
$sDataBase = 'database_' . strtolower( DB_ADAPTER ); $sDataBase = 'database_' . strtolower( DB_ADAPTER );
if (G::LoadSystemExist( $sDataBase )) {
$oDataBase = new database(); $oDataBase = new database();
$bExists = $oDataBase->reportTableExist(); $bExists = $oDataBase->reportTableExist();
}
return $bExists; return $bExists;
} }