From: atif-shaikh <shaikh388@gmail.com>
Date: Fri, 20 Mar 2015 05:44:11 +0000 (+0530)
Subject: CRM-14105 - WordPress: mail_report Scheduled Job "access denied" unless report permis... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b1dd8421de53004fa9dcdd43d114b8c1dbb7b375;p=civicrm-core.git

CRM-14105 - WordPress: mail_report Scheduled Job "access denied" unless report permission = Everyone

https://issues.civicrm.org/jira/browse/CRM-14105
---

diff --git a/templates/CRM/common/drupal.tpl b/templates/CRM/common/drupal.tpl
index a754729679..d77d5abcdd 100644
--- a/templates/CRM/common/drupal.tpl
+++ b/templates/CRM/common/drupal.tpl
@@ -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}
diff --git a/templates/CRM/common/drupal6.tpl b/templates/CRM/common/drupal6.tpl
index 07d5da7928..2008ddd6f0 100644
--- a/templates/CRM/common/drupal6.tpl
+++ b/templates/CRM/common/drupal6.tpl
@@ -64,7 +64,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}
diff --git a/templates/CRM/common/joomla.tpl b/templates/CRM/common/joomla.tpl
index 171dee955f..936cc20dbb 100644
--- a/templates/CRM/common/joomla.tpl
+++ b/templates/CRM/common/joomla.tpl
@@ -85,7 +85,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}
diff --git a/templates/CRM/common/print.tpl b/templates/CRM/common/print.tpl
index 255e6a57bf..32118854c3 100644
--- a/templates/CRM/common/print.tpl
+++ b/templates/CRM/common/print.tpl
@@ -45,7 +45,7 @@
 
 {crmRegion name='page-body' allowCmsOverride=0}
 <!-- .tpl file invoked: {$tplFile}. Call via form.tpl if we have a form in the page. -->
-  {if $isForm}
+  {if $isForm and isset($formTpl)}
     {include file="CRM/Form/$formTpl.tpl"}
   {else}
     {include file=$tplFile}
diff --git a/templates/CRM/common/printBody.tpl b/templates/CRM/common/printBody.tpl
index 7c875453ac..b42876fda9 100644
--- a/templates/CRM/common/printBody.tpl
+++ b/templates/CRM/common/printBody.tpl
@@ -26,7 +26,7 @@
 {* printBody.tpl: wrapper for Print views without HTML surrounds. *}
 
 <!-- .tpl file invoked: {$tplFile}. Call via form.tpl if we have a form in the page. -->
-{if $isForm}
+{if $isForm and isset($formTpl)}
     {include file="CRM/Form/$formTpl.tpl"}
 {else}
     {include file=$tplFile}
diff --git a/templates/CRM/common/wordpress.tpl b/templates/CRM/common/wordpress.tpl
index 77da6eaa2b..641ea9efdc 100644
--- a/templates/CRM/common/wordpress.tpl
+++ b/templates/CRM/common/wordpress.tpl
@@ -81,7 +81,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}