Merge pull request #2236 from eileenmcnaughton/CRM-14008

[civicrm-core.git] / CRM / Core / BAO / Tag.php

diff --git a/CRM/Core/BAO/Tag.php b/CRM/Core/BAO/Tag.php
index fcf7ff7e21805e538a0e1bff81f0539adfc713c9..3689539a98ff865e4d2ee6dcc1609efa47dcae2d 100644 (file)
--- a/CRM/Core/BAO/Tag.php
+++ b/CRM/Core/BAO/Tag.php
@@ -187,6 +187,9 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag {
     $parentId  = NULL,
     $separator = '  '
   ) {
+    if (!is_array($tags)) {
+      $tags = array();
+    }
     // We need to build a list of tags ordered by hierarchy and sorted by
     // name. The heirarchy will be communicated by an accumulation of
     // separators in front of the name to give it a visual offset.
@@ -283,7 +286,6 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag {
 
     if ($tag->delete()) {
       CRM_Utils_Hook::post('delete', 'Tag', $id, $tag);
-      CRM_Core_Session::setStatus(ts('Selected tag has been deleted successfuly.'), ts('Tag Deleted'), 'success');
       return TRUE;
     }
     return FALSE;