Merge pull request #2007 from civicrm/4.4

Merge branch 4.4 into master

CRM/Contact/Form/Task/PDFLetterCommon.php

@@ -373,7 +373,7 @@ class CRM_Contact_Form_Task_PDFLetterCommon {
     CRM_Utils_System::civiExit(1);
   }
 
-  function createActivities($form, $html_message, $contactIds) {
+  static function createActivities($form, $html_message, $contactIds) {
     //Added for CRM-12682: Add activity subject and campaign fields
     $formValues     = $form->controller->exportValues($form->getName());
 
@@ -420,7 +420,7 @@ class CRM_Contact_Form_Task_PDFLetterCommon {
     }
   }
 
-  function formatMessage(&$message) {
+  static function formatMessage(&$message) {
     $newLineOperators = array(
       'p' => array(
         'oper' => '<p>',

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() {

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. -->

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)}