projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-18310 add tests for debug logging, fix caching error
[civicrm-core.git]
/
CRM
/
Core
/
DAO.php
diff --git
a/CRM/Core/DAO.php
b/CRM/Core/DAO.php
index 1b01d7455faa506ece38ca4633e74fa9d2b03668..cb02a95c57335ff71943064581fa23d3b27b6b9a 100644
(file)
--- a/
CRM/Core/DAO.php
+++ b/
CRM/Core/DAO.php
@@
-1331,14
+1331,16
@@
FROM civicrm_domain
}
/**
}
/**
- * @param $query
+ * Compose the query by merging the parameters into it.
+ *
+ * @param string $query
* @param array $params
* @param bool $abort
*
* @return string
* @throws Exception
*/
* @param array $params
* @param bool $abort
*
* @return string
* @throws Exception
*/
- public static function composeQuery($query,
&
$params, $abort = TRUE) {
+ public static function composeQuery($query, $params, $abort = TRUE) {
$tr = array();
foreach ($params as $key => $item) {
if (is_numeric($key)) {
$tr = array();
foreach ($params as $key => $item) {
if (is_numeric($key)) {