Merge pull request #2006 from civicrm/4.3

Merge branch 4.3 into 4.4

diff --git a/CRM/Core/Session.php b/CRM/Core/Session.php
index f3d1c169f52223a2da3d65da8e7a7d3c847e585b..d667b837255c79ecd173a89864e1ebdd24a48b7c 100644 (file)
--- a/CRM/Core/Session.php
+++ b/CRM/Core/Session.php
@@ -88,7 +88,7 @@ class CRM_Core_Session {
   /**
    * singleton function used to manage this object
    *
-   * @return CRM_CoreSession
+   * @return CRM_Core_Session
    * @static
    */
   static function &singleton() {

diff --git a/templates/CRM/common/print.tpl b/templates/CRM/common/print.tpl
index f1f56756620179c607f40cb63dc7294140134a0a..5ab820cd45647e377d3a9887705f07b76a5951b4 100644 (file)
--- a/templates/CRM/common/print.tpl
+++ b/templates/CRM/common/print.tpl
@@ -41,12 +41,7 @@
 <div id="crm-container" class="crm-container" lang="{$config->lcMessages|truncate:2:"":true}" xml:lang="{$config->lcMessages|truncate:2:"":true}">
 {crmRegion name='page-header' allowCmsOverride=0}{/crmRegion}
 {* Check for Status message for the page (stored in session->getStatus). Status is cleared on retrieval. *}
-{if $session->getStatus(false)}
-<div class="messages status no-popup">
-  <div class="icon inform-icon"></div>
-  {$session->getStatus(true)}
-</div>
-{/if}
+{include file="CRM/common/status.tpl"}
 
 {crmRegion name='page-body' allowCmsOverride=0}
 <!-- .tpl file invoked: {$tplFile}. Call via form.tpl if we have a form in the page. -->

diff --git a/templates/CRM/common/snippet.tpl b/templates/CRM/common/snippet.tpl
index 5b727b1d40e69c7d52384a364361ad749fe1ee29..cb71658916f9f43a35d58f6f1c9d7653d1d193fc 100644 (file)
--- a/templates/CRM/common/snippet.tpl
+++ b/templates/CRM/common/snippet.tpl
@@ -40,12 +40,7 @@
     <div class="crm-container-snippet" bgColor="white">
 
     {* Check for Status message for the page (stored in session->getStatus). Status is cleared on retrieval. *}
-    {if $session->getStatus(false)}
-    <div class="messages status no-popup">
-      <div class="icon alert-icon"></div>
-      {$session->getStatus(true)}
-    </div>
-    {/if}
+    {include file="CRM/common/status.tpl"}
 
     <!-- .tpl file invoked: {$tplFile}. Call via form.tpl if we have a form in the page. -->
     {if !empty($isForm)}