projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
99c38fc
)
Xaviers fix for CRM-14506
author
systopia
<endres@systopia.de>
Mon, 5 May 2014 09:25:19 +0000
(11:25 +0200)
committer
Tim Otten
<totten@civicrm.org>
Tue, 6 May 2014 16:52:00 +0000
(09:52 -0700)
CRM/Utils/REST.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Utils/REST.php
b/CRM/Utils/REST.php
index 6d501ddf46ead253d09bc9b0cf3f075f8074dfd2..d4d15d2cfe5c5033e6241227b92779af0341d28a 100644
(file)
--- a/
CRM/Utils/REST.php
+++ b/
CRM/Utils/REST.php
@@
-248,7
+248,8
@@
class CRM_Utils_REST {
if (!empty($r)) {
$q = $r;
}
- if (!empty($q)) {
+ $entity = CRM_Utils_array::value('entity', $requestParams);
+ if ( empty($entity) && !empty($q)) {
$args = explode('/', $q);
// If the function isn't in the civicrm namespace, reject the request.
if ($args[0] != 'civicrm') {