Fixed a bug in the generatePDF function where the wkhtmltopdf_binary config...

Fixed a bug in the generatePDF function where the wkhtmltopdf_binary config option was being ignored.

code/pagetypes/BasePage.php

@@ -398,7 +398,7 @@ class BasePage_Controller extends ContentController {
 		$proxy = $this->getPDFProxy($pdf_base_url);
 
 		// finally, generate the PDF
-		$command = WKHTMLTOPDF_BINARY . $proxy . ' --outline -B 40pt -L 20pt -R 20pt -T 20pt --encoding utf-8 --orientation Portrait --disable-javascript --quiet --print-media-type ';
+		$command = $binaryPath . $proxy . ' --outline -B 40pt -L 20pt -R 20pt -T 20pt --encoding utf-8 --orientation Portrait --disable-javascript --quiet --print-media-type ';
 		$retVal = 0;
 		$output = array();
 		exec($command . " --footer-html \"$footerFile\" \"$bodyFile\" \"$pdfFile\" &> /dev/stdout", $output, $return_val);