From 66d0e5f39fcc3eb3f8fd8f840b49de290bb39355 Mon Sep 17 00:00:00 2001
From: Kurund Jalmi <kurund@civicrm.org>
Date: Wed, 29 May 2013 13:45:23 +0530
Subject: [PATCH] notice fixes

---
 CRM/Core/BAO/PdfFormat.php  | 4 ++--
 CRM/Mailing/BAO/Mailing.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/BAO/PdfFormat.php b/CRM/Core/BAO/PdfFormat.php
index 0ee59a53e9..1b3c8c9b2f 100644
--- a/CRM/Core/BAO/PdfFormat.php
+++ b/CRM/Core/BAO/PdfFormat.php
@@ -97,7 +97,7 @@ class CRM_Core_BAO_PdfFormat extends CRM_Core_DAO_OptionValue {
    * @return array   array of page orientations
    * @access public
    */
-  function getPageOrientations() {
+  public static function getPageOrientations() {
     return array(
       'portrait' => ts('Portrait'),
       'landscape' => ts('Landscape'),
@@ -112,7 +112,7 @@ class CRM_Core_BAO_PdfFormat extends CRM_Core_DAO_OptionValue {
    * @return array   array of measurement units
    * @access public
    */
-  function getUnits() {
+  public static function getUnits() {
     return array(
       'in' => ts('Inches'),
       'cm' => ts('Centimeters'),
diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php
index eca2fd282b..c1343f1850 100644
--- a/CRM/Mailing/BAO/Mailing.php
+++ b/CRM/Mailing/BAO/Mailing.php
@@ -2467,7 +2467,7 @@ LEFT JOIN civicrm_mailing_group g ON g.mailing_id   = m.id
    * @return None
    * @access public
    */
-  public function commonLetterCompose(&$form) {
+  public static function commonLetterCompose(&$form) {
     //get the tokens.
     $tokens = CRM_Core_SelectValues::contactTokens();
     if (CRM_Utils_System::getClassName($form) == 'CRM_Mailing_Form_Upload') {
@@ -2516,7 +2516,7 @@ LEFT JOIN civicrm_mailing_group g ON g.mailing_id   = m.id
         'onkeyup' => "return verify(this)",
       )
     );
-    $action = CRM_Utils_Request::retrieve('action', 'String', $this, FALSE);
+    $action = CRM_Utils_Request::retrieve('action', 'String', $form, FALSE);
     if ((CRM_Utils_System::getClassName($form) == 'CRM_Contact_Form_Task_PDF') &&
       $action == CRM_Core_Action::VIEW
     ) {
-- 
2.25.1