Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-06-19-31-58

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

diff --git a/CRM/Core/BAO/PdfFormat.php b/CRM/Core/BAO/PdfFormat.php
index 6778b5fa93c58077cd60df30088e809ec5f45273..60b7739a4b3127b91125a7b1619cb68d0bc56515 100644 (file)
--- a/CRM/Core/BAO/PdfFormat.php
+++ b/CRM/Core/BAO/PdfFormat.php
@@ -306,7 +306,7 @@ class CRM_Core_BAO_PdfFormat extends CRM_Core_DAO_OptionValue {
       foreach (self::$optionValueFields as $name => $field) {
         if (!isset($values[$name])) {
           $values[$name] = $field['default'];
-          if ($field['metric']) {
+          if (!empty($field['metric'])) {
             $values[$name] = CRM_Utils_PDF_Utils::convertMetric($field['default'],
               self::$optionValueFields['metric']['default'],
               $values['metric'], 3