CRM-17186 - Add ts tags & normalize strings for paypal button

[civicrm-core.git] / templates / CRM / common / joomla.tpl

diff --git a/templates/CRM/common/joomla.tpl b/templates/CRM/common/joomla.tpl
index 171dee955f87b4ec095c7ff6b98ab9f21fb94c1a..cdfceb33583264d94c7211e5d607d97bc8b38a82 100644 (file)
--- a/templates/CRM/common/joomla.tpl
+++ b/templates/CRM/common/joomla.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -33,9 +33,6 @@
 <div id="crm-nav-menu-container"></div>
 {crmNavigationMenu is_default=1}
 
-{* include wysiwyg related files*}
-{include file="CRM/common/wysiwyg.tpl"}
-
 <table border="0" cellpadding="0" cellspacing="0" id="crm-content">
   <tr>
 {if $sidebarLeft}
@@ -85,7 +82,7 @@
       {include file="CRM/common/status.tpl"}
       {crmRegion name='page-body'}
         <!-- .tpl file invoked: {$tplFile}. Call via form.tpl if we have a form in the page. -->
-        {if isset($isForm) and $isForm}
+        {if isset($isForm) and $isForm and isset($formTpl)}
           {include file="CRM/Form/$formTpl.tpl"}
         {else}
           {include file=$tplFile}