projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-19-00-06-22
[civicrm-core.git]
/
CRM
/
Core
/
BAO
/
PdfFormat.php
diff --git
a/CRM/Core/BAO/PdfFormat.php
b/CRM/Core/BAO/PdfFormat.php
index a4b20d838fe9e91ac3b986aeaf4727e1827e9561..96a0f3ae2157064b70dc1484b0d91662ecc84b76 100644
(file)
--- a/
CRM/Core/BAO/PdfFormat.php
+++ b/
CRM/Core/BAO/PdfFormat.php
@@
-53,6
+53,11
@@
class CRM_Core_BAO_PdfFormat extends CRM_Core_DAO_OptionValue {
'type' => CRM_Utils_Type::T_STRING,
'default' => 'letter',
),
'type' => CRM_Utils_Type::T_STRING,
'default' => 'letter',
),
+ 'stationery' => array(
+ 'name' => 'stationery',
+ 'type' =>CRM_Utils_Type::T_STRING,
+ 'default' => '',
+ ),
'orientation' => array(
'name' => 'orientation',
'type' => CRM_Utils_Type::T_STRING,
'orientation' => array(
'name' => 'orientation',
'type' => CRM_Utils_Type::T_STRING,
@@
-256,10
+261,12
@@
class CRM_Core_BAO_PdfFormat extends CRM_Core_DAO_OptionValue {
/**
* Get PDF Page Format field from associative array
*
/**
* Get PDF Page Format field from associative array
*
- * @param string
$field
name of a PDF Page Format field
- * @param array (reference)
$values
associative array of name/value pairs containing
+ * @param string
$field
name of a PDF Page Format field
+ * @param array (reference)
$values
associative array of name/value pairs containing
* PDF Page Format field selections
*
* PDF Page Format field selections
*
+ * @param null $default
+ *
* @return value
* @access public
* @static
* @return value
* @access public
* @static