projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 4.6 into master
[civicrm-core.git]
/
CRM
/
Core
/
BAO
/
CustomQuery.php
diff --git
a/CRM/Core/BAO/CustomQuery.php
b/CRM/Core/BAO/CustomQuery.php
index 9c475f826a790bdaf20569c91bcfb9b48d12201a..512b7595c4d85899d70025da6a330e9981648dce 100644
(file)
--- a/
CRM/Core/BAO/CustomQuery.php
+++ b/
CRM/Core/BAO/CustomQuery.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 4.6 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 4.6 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
4
|
+ | Copyright CiviCRM LLC (c) 2004-201
5
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-29,7
+29,7
@@
*
*
* @package CRM
*
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
4
+ * @copyright CiviCRM LLC (c) 2004-201
5
* $Id$
*
*/
* $Id$
*
*/
@@
-37,21
+37,21
@@
class CRM_Core_BAO_CustomQuery {
const PREFIX = 'custom_value_';
/**
const PREFIX = 'custom_value_';
/**
- * The set of custom field ids
+ * The set of custom field ids
.
*
* @var array
*/
protected $_ids;
/**
*
* @var array
*/
protected $_ids;
/**
- * The select clause
+ * The select clause
.
*
* @var array
*/
public $_select;
/**
*
* @var array
*/
public $_select;
/**
- * The name of the elements that are in the select clause
+ * The name of the elements that are in the select clause
.
* used to extract the values
*
* @var array
* used to extract the values
*
* @var array
@@
-59,7
+59,7
@@
class CRM_Core_BAO_CustomQuery {
public $_element;
/**
public $_element;
/**
- * The tables involved in the query
+ * The tables involved in the query
.
*
* @var array
*/
*
* @var array
*/
@@
-67,28
+67,28
@@
class CRM_Core_BAO_CustomQuery {
public $_whereTables;
/**
public $_whereTables;
/**
- * The where clause
+ * The where clause
.
*
* @var array
*/
public $_where;
/**
*
* @var array
*/
public $_where;
/**
- * The english language version of the query
+ * The english language version of the query
.
*
* @var array
*/
public $_qill;
/**
*
* @var array
*/
public $_qill;
/**
- * The cache to translate the option values into labels
+ * The cache to translate the option values into labels
.
*
* @var array
*/
public $_options;
/**
*
* @var array
*/
public $_options;
/**
- * The custom fields information
+ * The custom fields information
.
*
* @var array
*/
*
* @var array
*/
@@
-104,7
+104,7
@@
class CRM_Core_BAO_CustomQuery {
protected $_locationSpecificCustomFields;
/**
protected $_locationSpecificCustomFields;
/**
- * This stores custom data group types and tables that it extends
+ * This stores custom data group types and tables that it extends
.
*
* @var array
*/
*
* @var array
*/
@@
-129,7
+129,7
@@
class CRM_Core_BAO_CustomQuery {
);
/**
);
/**
- * Class constructor
+ * Class constructor
.
*
* Takes in a set of custom field ids andsets up the data structures to
* generate a query
*
* Takes in a set of custom field ids andsets up the data structures to
* generate a query
@@
-253,7
+253,7
@@
SELECT label, value
}
/**
}
/**
- * Generate the select clause and the associated tables
+ * Generate the select clause and the associated tables
.
* for the from clause
*
* @return void
* for the from clause
*
* @return void
@@
-318,7
+318,7
@@
SELECT label, value
}
/**
}
/**
- * Generate the where clause and also the english language
+ * Generate the where clause and also the english language
.
* equivalent
*
* @return void
* equivalent
*
* @return void
@@
-482,7
+482,7
@@
SELECT label, value
$toValue = CRM_Utils_Array::value('to', $value);
if (!$fromValue && !$toValue) {
$toValue = CRM_Utils_Array::value('to', $value);
if (!$fromValue && !$toValue) {
- if (!CRM_Utils_Date::processDate($value) &&
$op != 'IS NULL' && $op != 'IS NOT NULL'
) {
+ if (!CRM_Utils_Date::processDate($value) &&
!in_array($op, array('IS NULL', 'IS NOT NULL', 'IS EMPTY', 'IS NOT EMPTY'))
) {
continue;
}
continue;
}
@@
-548,7
+548,7
@@
SELECT label, value
}
/**
}
/**
- * Function that does the actual query generation
+ * Function that does the actual query generation
.
* basically ties all the above functions together
*
* @return array
* basically ties all the above functions together
*
* @return array