From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 2 Nov 2015 21:58:29 +0000 (-0500)
Subject: Merge branch '4.6' into master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=25d95f38e877adc852b7fee2e27b59f96ab654a8;p=civicrm-core.git

Merge branch '4.6' into master

Conflicts:
	templates/CRM/common/footer.tpl
---

25d95f38e877adc852b7fee2e27b59f96ab654a8
diff --cc templates/CRM/common/footer.tpl
index a61bfebee1,01e4bf91a9..242e573555
--- a/templates/CRM/common/footer.tpl
+++ b/templates/CRM/common/footer.tpl
@@@ -23,22 -23,27 +23,24 @@@
   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
   +--------------------------------------------------------------------+
  *}
- {include file="CRM/common/accesskeys.tpl"}
- {if !empty($contactId)}
-   {include file="CRM/common/contactFooter.tpl"}
- {/if}
+ {if call_user_func(array('CRM_Core_Permission','check'), 'access CiviCRM')}
+   {include file="CRM/common/accesskeys.tpl"}
+   {if !empty($contactId)}
+     {include file="CRM/common/contactFooter.tpl"}
+   {/if}
  
- <div class="crm-footer" id="civicrm-footer">
-   {crmVersion assign=version}
-   {ts 1=$version}Powered by CiviCRM %1.{/ts}
-   {if $footer_status_severity}
-     <span class="status{if $footer_status_severity gt 3} crm-error{elseif $footer_status_severity gt 2} crm-warning{else} crm-ok{/if}">
+   <div class="crm-footer" id="civicrm-footer">
+     {crmVersion assign=version}
+     {ts 1=$version}Powered by CiviCRM %1.{/ts}
 -    {if !empty($security_update)}
 -      <span class="status crm-error">
 -      <a href="https://civicrm.org/advisory">{ts}Security update required.{/ts}</a></span>
 -    {elseif !empty($newer_civicrm_version)}
 -      <span class="status">{ts 1=$newer_civicrm_version}A newer version (%1){/ts}
 -        <a href="https://civicrm.org/download">{ts}is available for download{/ts}</a>.
 -      </span>
++    {if $footer_status_severity}
++      <span class="status{if $footer_status_severity gt 3} crm-error{elseif $footer_status_severity gt 2} crm-warning{else} crm-ok{/if}">
 +      <a href="{crmURL p='civicrm/a/#/status'}">{$footer_status_message}</a>
 +    </span>
-   {/if}
-   {ts 1='http://www.gnu.org/licenses/agpl-3.0.html'}CiviCRM is openly available under the <a href='%1'>GNU AGPL License</a>.{/ts}<br/>
-   <a href="https://civicrm.org/download">{ts}Download CiviCRM.{/ts}</a> &nbsp; &nbsp;
-   <a href="http://issues.civicrm.org/jira/browse/CRM?report=com.atlassian.jira.plugin.system.project:roadmap-panel">{ts}View issues and report bugs.{/ts}</a> &nbsp; &nbsp;
-   {docURL page="" text="Online documentation."}
- </div>
- {include file="CRM/common/notifications.tpl"}
+     {/if}
+     {ts 1='http://www.gnu.org/licenses/agpl-3.0.html'}CiviCRM is openly available under the <a href='%1'>GNU AGPL License</a>.{/ts}<br/>
+     <a href="https://civicrm.org/download">{ts}Download CiviCRM.{/ts}</a> &nbsp; &nbsp;
+     <a href="http://issues.civicrm.org/jira/browse/CRM?report=com.atlassian.jira.plugin.system.project:roadmap-panel">{ts}View issues and report bugs.{/ts}</a> &nbsp; &nbsp;
+     {docURL page="" text="Online documentation."}
+   </div>
+   {include file="CRM/common/notifications.tpl"}
+ {/if}