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:
82eff07
)
CRM-20381 - we don't need $name defined above, it will always be defined
author
Jamie McClelland
<jm@mayfirst.org>
Wed, 19 Apr 2017 14:12:33 +0000
(10:12 -0400)
committer
Jamie McClelland
<jm@mayfirst.org>
Wed, 19 Apr 2017 14:12:33 +0000
(10:12 -0400)
CRM/Core/Config/MagicMerge.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Core/Config/MagicMerge.php
b/CRM/Core/Config/MagicMerge.php
index 0d6b722d21a711a6f98474e7357e0809f46cf692..e096c4c097d8609b4f1eb51444d2216210f94558 100644
(file)
--- a/
CRM/Core/Config/MagicMerge.php
+++ b/
CRM/Core/Config/MagicMerge.php
@@
-310,7
+310,6
@@
class CRM_Core_Config_MagicMerge {
unset($this->cache[$k]);
$type = $this->map[$k][0];
- $name = $k;
// If foreign name is set, use that name (except with callback types because
// their second parameter is the object, not the foreign name).
$name = isset($this->map[$k][1]) && $type != 'callback' ? $this->map[$k][1] : $k;