Merge pull request #3745 from colemanw/relMemberApi

[civicrm-core.git] / CRM / Core / BAO / PaperSize.php

diff --git a/CRM/Core/BAO/PaperSize.php b/CRM/Core/BAO/PaperSize.php
index c0f6c273c0982f71104c3bde62547123273693f3..d6811981af32058e440b9f9ce393362c162c4c90 100644 (file)
--- a/CRM/Core/BAO/PaperSize.php
+++ b/CRM/Core/BAO/PaperSize.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
  | Copyright (C) 2011 Marty Wright                                    |
  | Licensed to CiviCRM under the Academic Free License version 3.0.   |
@@ -29,7 +29,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -199,10 +199,12 @@ class CRM_Core_BAO_PaperSize extends CRM_Core_DAO_OptionValue {
   /**
    * Get Paper Size field from associative array
    *
-   * @param string              $field         name of a Paper Size field
-   * @param array (reference)   $values        associative array of name/value pairs containing
+   * @param string $field name of a Paper Size field
+   * @param array (reference) $values associative array of name/value pairs containing
    *                                           Paper Size field selections
    *
+   * @param null $default
+   *
    * @return value
    * @access public
    * @static