From 18d13c82749db919bff820ad9541a022fcc143b8 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 20 Dec 2013 10:42:14 -0800
Subject: [PATCH] CRM-14015 - Code cleanup and fix invalid markup in action
 links

---
 CRM/Admin/Page/ContactType.php |  8 ++------
 CRM/Core/Action.php            | 34 +++++++++++-----------------------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/CRM/Admin/Page/ContactType.php b/CRM/Admin/Page/ContactType.php
index 3c191525f5..870e7038b5 100644
--- a/CRM/Admin/Page/ContactType.php
+++ b/CRM/Admin/Page/ContactType.php
@@ -73,18 +73,14 @@ class CRM_Admin_Page_ContactType extends CRM_Core_Page_Basic {
         CRM_Core_Action::DISABLE =>
         array(
           'name' => ts('Disable'),
-          'extra' => 'onclick = "enableDisable( %%id%%,\'' .
-          'CRM_Contact_BAO_ContactType' . '\',\'' . 'enable-disable' .
-          '\' );"',
+          'extra' => 'onclick = "enableDisable( %%id%%,\'' . 'CRM_Contact_BAO_ContactType' . '\',\'' . 'enable-disable' . '\' );"',
           'ref' => 'disable-action',
           'title' => ts('Disable Contact Type'),
         ),
         CRM_Core_Action::ENABLE =>
         array(
           'name' => ts('Enable'),
-          'extra' => 'onclick = "enableDisable( %%id%%,\'' .
-          'CRM_Contact_BAO_ContactType' . '\',\'' . 'disable-enable' .
-          '\' );"',
+          'extra' => 'onclick = "enableDisable( %%id%%,\'' . 'CRM_Contact_BAO_ContactType' . '\',\'' . 'disable-enable' . '\' );"',
           'ref' => 'enable-action',
           'title' => ts('Enable Contact Type'),
         ),
diff --git a/CRM/Core/Action.php b/CRM/Core/Action.php
index 2cb78ffd6b..3e6edc7bfb 100644
--- a/CRM/Core/Action.php
+++ b/CRM/Core/Action.php
@@ -238,16 +238,13 @@ class CRM_Core_Action {
 
         $frontend = (isset($link['fe'])) ? TRUE : FALSE;
 
-        $urlPath = NULL;
-        if (CRM_Utils_Array::value('qs', $link) &&
-          !CRM_Utils_System::isNull($link['qs'])
-        ) {
+        if (isset($link['qs']) && !CRM_Utils_System::isNull($link['qs'])) {
           $urlPath = CRM_Utils_System::url(self::replace($link['url'], $values),
             self::replace($link['qs'], $values), TRUE, NULL, TRUE, $frontend
           );
         }
         else {
-          $urlPath = CRM_Utils_Array::value('url', $link);
+          $urlPath = CRM_Utils_Array::value('url', $link, '#');
         }
 
         $classes = 'action-item';
@@ -268,26 +265,17 @@ class CRM_Core_Action {
           $classes .= ' ' . strtolower($className);
         }
 
-        $linkClasses = 'class = "' . $classes . '"';
+        $linkClasses = 'class="' . $classes . '"';
 
-        if ($urlPath) {
-          if ($frontend) {
-            $extra .= "target=_blank";
-          }
-          $url[] = sprintf('<a href="%s" %s title="%s"' . $extra . '>%s</a>',
-            $urlPath,
-            $linkClasses,
-            CRM_Utils_Array::value('title', $link),
-            $link['name']
-          );
-        }
-        else {
-          $url[] = sprintf('<a title="%s"  %s ' . $extra . '>%s</a>',
-            CRM_Utils_Array::value('title', $link),
-            $linkClasses,
-            $link['name']
-          );
+        if ($urlPath !== '#' && $frontend) {
+          $extra .= ' target="_blank"';
         }
+        $url[] = sprintf('<a href="%s" %s title="%s" ' . $extra . '>%s</a>',
+          $urlPath,
+          $linkClasses,
+          CRM_Utils_Array::value('title', $link),
+          $link['name']
+        );
       }
     }
 
-- 
2.25.1