Fixes CRM-13979 by moving the status update out of the BAO layer.

diff --git a/CRM/Admin/Form/Tag.php b/CRM/Admin/Form/Tag.php
index be6b4388870a1da1bd54b8f8d8fda44a5a915194..b8ca3ba08d9a40ca43cdd5d042430260e323e3b4 100644 (file)
--- a/CRM/Admin/Form/Tag.php
+++ b/CRM/Admin/Form/Tag.php
@@ -166,7 +166,9 @@ class CRM_Admin_Form_Tag extends CRM_Admin_Form {
 
     if ($this->_action == CRM_Core_Action::DELETE) {
       if ($this->_id > 0) {
+        $tag = civicrm_api3('tag', 'getsingle', array('id' => $this->_id));
         CRM_Core_BAO_Tag::del($this->_id);
+        CRM_Core_Session::setStatus(ts('The tag \'%1\' has been deleted.', array(1 => $tag->name)), ts('Deleted'), 'success');
       }
     }
     else {

diff --git a/CRM/Core/BAO/Tag.php b/CRM/Core/BAO/Tag.php
index ddd639cb04750d2bca372ea874799fceea473c44..3689539a98ff865e4d2ee6dcc1609efa47dcae2d 100644 (file)
--- a/CRM/Core/BAO/Tag.php
+++ b/CRM/Core/BAO/Tag.php
@@ -286,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;