From a71e41e09f29baa424c08e057a623a09dddab8dc Mon Sep 17 00:00:00 2001 From: Kevin Kaland <kevin@wizonesolutions.com> Date: Tue, 6 Mar 2012 22:19:49 -0800 Subject: [PATCH] Issue #1471328: Make flatten=0 work when using PHP/JavaBridge. --- fillpdf.module | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/fillpdf.module b/fillpdf.module index 5843d06..36c0341 100644 --- a/fillpdf.module +++ b/fillpdf.module @@ -435,7 +435,18 @@ function fillpdf_merge_pdf($fid, $nids = NULL, $webform_arr = NULL, $sample = NU drupal_set_message(check_plain(java_truncate((string) $e)), 'error'); drupal_goto(); // after setting error message } - $data = java_values(base64_decode($fillpdf->toByteArray())); + try { + if ($flatten) { + $data = java_values(base64_decode($fillpdf->toByteArray())); + } + else { + $data = java_values(base64_decode($fillpdf->toByteArrayUnflattened())); + } + } + catch (JavaException $e) { + drupal_set_message(java_truncate((string)$e), 'error'); + drupal_goto(); //after setting error message + } break; case 'pdftk': // Use PDFTK to merge the two -- GitLab