projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-20-15-52-17
[civicrm-core.git]
/
CRM
/
Admin
/
Form
/
Tag.php
diff --git
a/CRM/Admin/Form/Tag.php
b/CRM/Admin/Form/Tag.php
index fc3f62a7f3ae1e7ea23ff500d6c7332efe4eff92..eb871d066b506263a783e447c08dcb319d9d7486 100644
(file)
--- a/
CRM/Admin/Form/Tag.php
+++ b/
CRM/Admin/Form/Tag.php
@@
-54,20
+54,6
@@
class CRM_Admin_Form_Tag extends CRM_Admin_Form {
CRM_Utils_System::redirect($url);
return TRUE;
}
CRM_Utils_System::redirect($url);
return TRUE;
}
- else {
- $this->addButtons(array(
- array(
- 'type' => 'next',
- 'name' => ts('Delete'),
- 'isDefault' => TRUE,
- ),
- array(
- 'type' => 'cancel',
- 'name' => ts('Cancel'),
- ),
- )
- );
- }
}
else {
$this->_isTagSet = CRM_Utils_Request::retrieve('tagset', 'Positive', $this);
}
else {
$this->_isTagSet = CRM_Utils_Request::retrieve('tagset', 'Positive', $this);
@@
-128,8
+114,8
@@
class CRM_Admin_Form_Tag extends CRM_Admin_Form {
}
$this->assign('adminReservedTags', $adminReservedTags);
}
$this->assign('adminReservedTags', $adminReservedTags);
- parent::buildQuickForm();
}
}
+ parent::buildQuickForm();
}
/**
}
/**