projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #13890 from aydun/joomla#6
[civicrm-core.git]
/
CRM
/
Core
/
Reference
/
OptionValue.php
diff --git
a/CRM/Core/Reference/OptionValue.php
b/CRM/Core/Reference/OptionValue.php
index 7229af33d775db9440cf9973c33a2b8d0eb53907..94db03591258208aa3d630ebfd4632a739c2b7f8 100644
(file)
--- a/
CRM/Core/Reference/OptionValue.php
+++ b/
CRM/Core/Reference/OptionValue.php
@@
-21,7
+21,7
@@
class CRM_Core_Reference_OptionValue extends CRM_Core_Reference_Basic {
* @param string $targetKey
* @param null $optionGroupName
*/
* @param string $targetKey
* @param null $optionGroupName
*/
- function __construct($refTable, $refKey, $targetTable = NULL, $targetKey = 'id', $optionGroupName) {
+
public
function __construct($refTable, $refKey, $targetTable = NULL, $targetKey = 'id', $optionGroupName) {
parent::__construct($refTable, $refKey, $targetTable, $targetKey, NULL);
$this->targetOptionGroupName = $optionGroupName;
}
parent::__construct($refTable, $refKey, $targetTable, $targetKey, NULL);
$this->targetOptionGroupName = $optionGroupName;
}
@@
-33,12
+33,13
@@
class CRM_Core_Reference_OptionValue extends CRM_Core_Reference_Basic {
* @throws CRM_Core_Exception
*/
public function findReferences($targetDao) {
* @throws CRM_Core_Exception
*/
public function findReferences($targetDao) {
- if (!
($targetDao instanceof CRM_Core_DAO_OptionValue)) {
+ if (!($targetDao instanceof CRM_Core_DAO_OptionValue)) {
throw new CRM_Core_Exception("Mismatched reference: expected OptionValue but received " . get_class($targetDao));
}
if ($targetDao->option_group_id == $this->getTargetOptionGroupId()) {
return parent::findReferences($targetDao);
throw new CRM_Core_Exception("Mismatched reference: expected OptionValue but received " . get_class($targetDao));
}
if ($targetDao->option_group_id == $this->getTargetOptionGroupId()) {
return parent::findReferences($targetDao);
- } else {
+ }
+ else {
return NULL;
}
}
return NULL;
}
}
@@
-50,12
+51,13
@@
class CRM_Core_Reference_OptionValue extends CRM_Core_Reference_Basic {
* @throws CRM_Core_Exception
*/
public function getReferenceCount($targetDao) {
* @throws CRM_Core_Exception
*/
public function getReferenceCount($targetDao) {
- if (!
($targetDao instanceof CRM_Core_DAO_OptionValue)) {
+ if (!($targetDao instanceof CRM_Core_DAO_OptionValue)) {
throw new CRM_Core_Exception("Mismatched reference: expected OptionValue but received " . get_class($targetDao));
}
if ($targetDao->option_group_id == $this->getTargetOptionGroupId()) {
return parent::getReferenceCount($targetDao);
throw new CRM_Core_Exception("Mismatched reference: expected OptionValue but received " . get_class($targetDao));
}
if ($targetDao->option_group_id == $this->getTargetOptionGroupId()) {
return parent::getReferenceCount($targetDao);
- } else {
+ }
+ else {
return NULL;
}
}
return NULL;
}
}
@@
-69,4
+71,5
@@
class CRM_Core_Reference_OptionValue extends CRM_Core_Reference_Basic {
}
return $this->targetOptionGroupId;
}
}
return $this->targetOptionGroupId;
}
+
}
}