Merge pull request puppetlabs#153 from grundprinzip/fix_pdf_options_d…

…efault_dir Fix PDF Options Bug
halfbyte · Nov 21, 2011 · 0ea1df5 · 0ea1df5
2 parents 0657b2d + 5709d39
commit 0ea1df5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/showoff.rb b/lib/showoff.rb
@@ -382,7 +382,7 @@ def pdf(static=true)
 
       # PDFKit.new takes the HTML and any options for wkhtmltopdf
       # run `wkhtmltopdf --extended-help` for a full list of options
-      kit = PDFKit.new(html, ShowOffUtils.showoff_pdf_options)
+      kit = PDFKit.new(html, ShowOffUtils.showoff_pdf_options(settings.pres_dir))
 
       # Save the PDF to a file
       file = kit.to_file('/tmp/preso.pdf')

diff --git a/lib/showoff_utils.rb b/lib/showoff_utils.rb
@@ -288,7 +288,7 @@ def self.get_config_option(dir, option, default = nil)
       data = JSON.parse(File.read(index))
       if data.is_a?(Hash)
         if default.is_a?(Hash)
-          default.merge(data[option])
+          default.merge(data[option] || default)
         else
           data[option] || default
         end