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 #13295 from andrewpthompson/andrewpthompson-dev-core-602
[civicrm-core.git]
/
CRM
/
Mailing
/
PseudoConstant.php
diff --git
a/CRM/Mailing/PseudoConstant.php
b/CRM/Mailing/PseudoConstant.php
index 0fcf1dfab53e96cbbd76d31743dd4afe932a20fb..84dbc6aa0bc1d8b24c74e92f72bef96874188ce5 100644
(file)
--- a/
CRM/Mailing/PseudoConstant.php
+++ b/
CRM/Mailing/PseudoConstant.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version
4.7
|
+ | CiviCRM version
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
8
|
+ | Copyright CiviCRM LLC (c) 2004-201
9
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
8
+ * @copyright CiviCRM LLC (c) 2004-201
9
*/
/**
*/
/**
@@
-158,13
+158,13
@@
class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant {
}
if (!$type) {
self::$component[$name] = NULL;
}
if (!$type) {
self::$component[$name] = NULL;
- CRM_Core_PseudoConstant::populate(self::$component[$name], 'CRM_Mailing_
DAO_
Component');
+ CRM_Core_PseudoConstant::populate(self::$component[$name], 'CRM_Mailing_
BAO_Mailing
Component');
}
else {
// we need to add an additional filter for $type
self::$component[$name] = array();
}
else {
// we need to add an additional filter for $type
self::$component[$name] = array();
- $object = new CRM_Mailing_
DAO_
Component();
+ $object = new CRM_Mailing_
BAO_Mailing
Component();
$object->component_type = $type;
$object->selectAdd();
$object->selectAdd("id, name");
$object->component_type = $type;
$object->selectAdd();
$object->selectAdd("id, name");