CRM-14105 - WordPress: mail_report Scheduled Job "access denied" unless report permis...

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

diff --git a/templates/CRM/common/drupal.tpl b/templates/CRM/common/drupal.tpl
index a754729679d9a84a4b12809fba22fd5947a1af46..d77d5abcdd37d21176657682313bed50f508fe2e 100644 (file)
--- 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 07d5da792818aec5788a620fb14a68bd3e05c56e..2008ddd6f0c4a0c454ef282b017075dd379a5d49 100644 (file)
--- 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 171dee955f87b4ec095c7ff6b98ab9f21fb94c1a..936cc20dbb6f52c3f19dd55e0a2a364dd9305d25 100644 (file)
--- 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 255e6a57bf7d5f76c2825424f78b6f0a1c88cee1..32118854c3fb416e51ea07b9eac8b588dc213633 100644 (file)
--- 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 7c875453acd37fcf8bb2b3436e159366bd6cbfbb..b42876fda9e49dcc9b3da11ee4c2df3eed95a685 100644 (file)
--- 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 77da6eaa2b6ceff326d801b1f3403ac1dbc7f390..641ea9efdc181febda2c169ece1cb7a6e3877e77 100644 (file)
--- 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}