projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-14499: Update FourFour upgrade script and changes image urls to improve security...
[civicrm-core.git]
/
CRM
/
Core
/
DAO.php
diff --git
a/CRM/Core/DAO.php
b/CRM/Core/DAO.php
index 25c72ac8c682495483b6958bd7e0f1f60f62ae71..9dea4c8676c42c669c29ef1ff6012a5e55c7a365 100644
(file)
--- a/
CRM/Core/DAO.php
+++ b/
CRM/Core/DAO.php
@@
-196,6
+196,7
@@
class CRM_Core_DAO extends DB_DataObject {
*/
function initialize() {
$this->_connect();
*/
function initialize() {
$this->_connect();
+ $this->query("SET NAMES utf8");
}
/**
}
/**
@@
-1264,6
+1265,11
@@
SELECT contact_id
$numObjects = 1,
$createOnly = FALSE
) {
$numObjects = 1,
$createOnly = FALSE
) {
+ //this is a test function also backtrace is set for the test suite it sometimes unsets itself
+ // so we re-set here in case
+ $config = CRM_Core_Config::singleton();
+ $config->backtrace = TRUE;
+
static $counter = 0;
CRM_Core_DAO::$_testEntitiesToSkip = array(
'CRM_Core_DAO_Worldregion',
static $counter = 0;
CRM_Core_DAO::$_testEntitiesToSkip = array(
'CRM_Core_DAO_Worldregion',
@@
-1295,6
+1301,10
@@
SELECT contact_id
//skip the FK if it is not required
// if it's contact id we should create even if not required
// we'll have a go @ fetching first though
//skip the FK if it is not required
// if it's contact id we should create even if not required
// we'll have a go @ fetching first though
+ // we WILL create campaigns though for so tests with a campaign pseudoconstant will complete
+ if($FKClassName === 'CRM_Campaign_DAO_Campaign' && $daoName != $FKClassName) {
+ $required = TRUE;
+ }
if (!$required && $dbName != 'contact_id') {
$fkDAO = new $FKClassName;
if($fkDAO->find(TRUE)){
if (!$required && $dbName != 'contact_id') {
$fkDAO = new $FKClassName;
if($fkDAO->find(TRUE)){
@@
-1348,7
+1358,12
@@
SELECT contact_id
case CRM_Utils_Type::T_DATE:
case CRM_Utils_Type::T_TIMESTAMP:
case CRM_Utils_Type::T_DATE:
case CRM_Utils_Type::T_TIMESTAMP:
+ case CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME:
$object->$dbName = '19700101';
$object->$dbName = '19700101';
+ if($dbName == 'end_date') {
+ // put this in the future
+ $object->$dbName = '20200101';
+ }
break;
case CRM_Utils_Type::T_TIME:
break;
case CRM_Utils_Type::T_TIME:
@@
-1418,8
+1433,12
@@
SELECT contact_id
static function deleteTestObjects($daoName, $params = array(
)) {
static function deleteTestObjects($daoName, $params = array(
)) {
+ //this is a test function also backtrace is set for the test suite it sometimes unsets itself
+ // so we re-set here in case
+ $config = CRM_Core_Config::singleton();
+ $config->backtrace = TRUE;
- $object = new $daoName
(
);
+ $object = new $daoName
(
);
$object->id = CRM_Utils_Array::value('id', $params);
$deletions = array(); // array(array(0 => $daoName, 1 => $daoParams))
$object->id = CRM_Utils_Array::value('id', $params);
$deletions = array(); // array(array(0 => $daoName, 1 => $daoParams))
@@
-1946,4
+1965,6
@@
EOS;
return substr($string, 0, $length - 8) . "_{$md5string}";
}
return substr($string, 0, $length - 8) . "_{$md5string}";
}
+ function setApiFilter(&$params) {}
+
}
}