+--------------------------------------------------------------------+
| CiviCRM version 4.6 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014 |
+ | Copyright CiviCRM LLC (c) 2004-2015 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
* $Id$
*
*/
$displayName = CRM_Contact_BAO_Contact::displayName($this->_contactId);
if ($defaults['is_deceased']) {
- $displayName .= ' <font color=red>(deceased)</font>';
+ $displayName .= ' <span class="crm-contact-deceased">(deceased)</span>';
}
-
$displayName = ts('Edit %1', array(1 => $displayName));
// Check if this is default domain contact CRM-10482
}
if ($this->_action == CRM_Core_Action::UPDATE) {
- $deleteExtra = ts('Are you sure you want to delete contact image.');
+ $deleteExtra = json_encode(ts('Are you sure you want to delete contact image.'));
$deleteURL = array(
CRM_Core_Action::DELETE => array(
'name' => ts('Delete Contact Image'),
'url' => 'civicrm/contact/image',
'qs' => 'reset=1&cid=%%id%%&action=delete',
- 'extra' =>
- 'onclick = "if (confirm( \'' . $deleteExtra . '\' ) ) this.href+=\'&confirmed=1\'; else return false;"',
+ 'extra' => 'onclick = "' . htmlspecialchars("if (confirm($deleteExtra)) this.href+='&confirmed=1'; else return false;") . '"',
),
);
$deleteURL = CRM_Core_Action::formLink($deleteURL,
// here we replace the user context with the url to view this contact
$buttonName = $this->controller->getButtonName();
if ($buttonName == $this->getButtonName('upload', 'new')) {
+ $contactSubTypes = array_filter(explode(CRM_Core_DAO::VALUE_SEPARATOR, $this->_contactSubType));
$resetStr = "reset=1&ct={$contact->contact_type}";
- $resetStr .= $this->_contactSubType ? "&cst={$this->_contactSubType}" : '';
+ $resetStr .= (count($contactSubTypes) == 1) ? "&cst=" . array_pop($contactSubTypes) : '';
$session->replaceUserContext(CRM_Utils_System::url('civicrm/contact/add', $resetStr));
}
else {