tpl enotice fixes on extensions page

diff --git a/CRM/Admin/Page/Extensions.php b/CRM/Admin/Page/Extensions.php
index 79b41002246f7b81b5a4a56ee41ab3f0cf934781..b8250a69a47d60d8fe182926773d1b29fb38b124 100644 (file)
--- 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 c28c33f566b42e899d9dfb6230d7d4e5eacb640f..46413b0e39a3b4a13a291fc8521f43b06df293a0 100644 (file)
--- 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 2cfa693a96afbcb1fa5402818162decc9fe36efd..e3e2c0207802b9cdaf7b327a550ee04658b788b2 100644 (file)
--- 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 c969794196fe9b258c5c8c0d99df2c6871e6a844..1e9179975abc8cd2e31baea4437fa653bb9a6da3 100644 (file)
--- 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}