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 #3949 from colemanw/CRM-15156
[civicrm-core.git]
/
CRM
/
Core
/
BAO
/
Persistent.php
diff --git
a/CRM/Core/BAO/Persistent.php
b/CRM/Core/BAO/Persistent.php
index 056c18f158d95d90325fb0e9eaaf353b6281d680..aabbdf5ba053f39e746702b83fe4f016aaf780d6 100644
(file)
--- a/
CRM/Core/BAO/Persistent.php
+++ b/
CRM/Core/BAO/Persistent.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | CiviCRM version 4.
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
3
|
+ | Copyright CiviCRM LLC (c) 2004-201
4
|
+--------------------------------------------------------------------+
| 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
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* $Id$
*
*/
* $Id$
*
*/
@@
-85,6
+85,12
@@
class CRM_Core_BAO_Persistent extends CRM_Core_DAO_Persistent {
return $persistentDAO;
}
return $persistentDAO;
}
+ /**
+ * @param $context
+ * @param null $name
+ *
+ * @return mixed
+ */
static function getContext($context, $name = NULL) {
static $contextNameData = array();
static function getContext($context, $name = NULL) {
static $contextNameData = array();