Skip to content

Commit

Permalink
dev/core#2046 Rationalise add vs create on website BAO
Browse files Browse the repository at this point in the history
2 years ago we deprecated 'calling website create in weird ways' - it seems like now we can remove that
handling & standardise on recommended create function & deprecate add

https://lab.civicrm.org/dev/core/-/issues/2046
  • Loading branch information
eileenmcnaughton committed Sep 26, 2020
1 parent d9c113b commit ea593f9
Showing 1 changed file with 8 additions and 15 deletions.
23 changes: 8 additions & 15 deletions CRM/Core/BAO/Website.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ class CRM_Core_BAO_Website extends CRM_Core_DAO_Website {
* Create or update Website record.
*
* @param array $params
*
* @return CRM_Core_DAO_Website
* @throws \CRM_Core_Exception
*/
public static function add($params) {
public static function create($params) {
return self::writeRecord($params);
}

Expand All @@ -36,23 +38,13 @@ public static function add($params) {
* If called in a legacy manner this, temporarily, fails back to calling the legacy function.
*
* @param array $params
* @param int $contactID
* @param bool $skipDelete
*
* @return bool|CRM_Core_BAO_Website
* @throws \CRM_Core_Exception
*/
public static function create($params, $contactID = NULL, $skipDelete = NULL) {
if ($skipDelete !== NULL || ($contactID && !is_array($contactID))) {
\Civi::log()->warning(ts('Calling website:create with vars other than $params is deprecated. Use process'), ['civi.tag' => 'deprecated']);
return self::process($params, $contactID, $skipDelete);
}
foreach ($params as $key => $value) {
if (is_numeric($key)) {
\Civi::log()->warning(ts('Calling website:create for multiple websites $params is deprecated. Use process'), ['civi.tag' => 'deprecated']);
return self::process($params, $contactID, $skipDelete);
}
}
return self::add($params);
public static function add($params) {
CRM_Core_Error::deprecatedFunctionWarning('use apiv4');
return self::create($params);
}

/**
Expand All @@ -65,6 +57,7 @@ public static function create($params, $contactID = NULL, $skipDelete = NULL) {
* @param bool $skipDelete
*
* @return bool
* @throws \CRM_Core_Exception
*/
public static function process($params, $contactID, $skipDelete) {
if (empty($params)) {
Expand Down

0 comments on commit ea593f9

Please sign in to comment.