From 5d011bd09355efcd1c8855b0ba193a72c0080234 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 20 Sep 2021 11:14:37 +1200
Subject: [PATCH] tpl enotice fixes on extensions page

---
 CRM/Admin/Page/Extensions.php                  | 1 +
 templates/CRM/Admin/Page/ExtensionDetails.tpl  | 2 +-
 templates/CRM/Admin/Page/Extensions/AddNew.tpl | 2 +-
 templates/CRM/common/TabHeader.tpl             | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CRM/Admin/Page/Extensions.php b/CRM/Admin/Page/Extensions.php
index 79b4100224..b8250a69a4 100644
--- a/CRM/Admin/Page/Extensions.php
+++ b/CRM/Admin/Page/Extensions.php
@@ -248,6 +248,7 @@ class CRM_Admin_Page_Extensions extends CRM_Core_Page_Basic {
       }
       $row = (array) $info;
       $row['id'] = $info->key;
+      $row['upgradelink'] = '';
       $action = CRM_Core_Action::UPDATE;
       $row['action'] = CRM_Core_Action::formLink(self::links(),
         $action,
diff --git a/templates/CRM/Admin/Page/ExtensionDetails.tpl b/templates/CRM/Admin/Page/ExtensionDetails.tpl
index c28c33f566..46413b0e39 100644
--- a/templates/CRM/Admin/Page/ExtensionDetails.tpl
+++ b/templates/CRM/Admin/Page/ExtensionDetails.tpl
@@ -60,7 +60,7 @@
         </td>
     </tr>
     <tr>
-      <td class="label">{ts}Local path{/ts}</td><td>{$extension.path|escape}</td>
+      <td class="label">{ts}Local path{/ts}</td><td>{if !empty($extension.path)}{$extension.path|escape}{/if}</td>
     </tr>
     {if !empty($extension.downloadUrl)}
     <tr>
diff --git a/templates/CRM/Admin/Page/Extensions/AddNew.tpl b/templates/CRM/Admin/Page/Extensions/AddNew.tpl
index 2cfa693a96..e3e2c02078 100644
--- a/templates/CRM/Admin/Page/Extensions/AddNew.tpl
+++ b/templates/CRM/Admin/Page/Extensions/AddNew.tpl
@@ -17,7 +17,7 @@ Depends: CRM/common/enableDisableApi.tpl and CRM/common/jsortable.tpl
       </thead>
       <tbody>
         {foreach from=$remoteExtensionRows key=extKey item=row}
-        {if $localExtensionRows[$extKey]}
+        {if !empty($localExtensionRows[$extKey])}
           {continue}
         {/if}
         <tr id="addnew-row_{$row.file}" class="crm-extensions crm-extensions_{$row.file}">
diff --git a/templates/CRM/common/TabHeader.tpl b/templates/CRM/common/TabHeader.tpl
index c969794196..1e9179975a 100644
--- a/templates/CRM/common/TabHeader.tpl
+++ b/templates/CRM/common/TabHeader.tpl
@@ -9,7 +9,7 @@
 *}
 {* enclose all tabs and its content in a block *}
 <div class="crm-block crm-content-block">
-  {if $tabHeader and count($tabHeader)}
+  {if !empty($tabHeader) and count($tabHeader)}
     <div id="mainTabContainer">
     <ul>
        {foreach from=$tabHeader key=tabName item=tabValue}
-- 
2.25.1