Merge pull request #5490 from rohankatkar/CRM-16170

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

diff --git a/templates/CRM/common/drupal.tpl b/templates/CRM/common/drupal.tpl
index 1a25037079e779c11120596964d02dcaa1e2eb3e..821a2213712245728dffef3eb0f0082097425d07 100644 (file)
--- a/templates/CRM/common/drupal.tpl
+++ b/templates/CRM/common/drupal.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -62,7 +62,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}
@@ -71,8 +71,10 @@
 </div>
 
 {crmRegion name='page-footer'}
-{if ! $urlIsPublic}
-{include file="CRM/common/footer.tpl"}
+{if $urlIsPublic}
+  {include file="CRM/common/publicFooter.tpl"}
+{else}
+  {include file="CRM/common/footer.tpl"}
 {/if}
 {/crmRegion}