webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Fixed conflicting PDF facade namespace and corrected php version

Browse Source 
Updated composer to have the correct config to install dependancies that
work for 7.0
This commit is contained in:
Dan Brown
2017-12-04 17:59:53 +00:00
parent 7668a999a2
commit 6ebe8bf619
5 changed files with 163 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Exceptions/Handler.php
View File

@ -26,10 +26,10 @@ class Handler extends ExceptionHandler
/**
* Report or log an exception.
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $e
* @return mixed
*/
public function report(Exception $e)
{

2
app/Services/ExportService.php
View File

@ -127,7 +127,7 @@ class ExportService
$pdf = \SnappyPDF::loadHTML($containedHtml);
$pdf->setOption('print-media-type', true);
} else {
$pdf = \PDF::loadHTML($containedHtml);
$pdf = \DomPDF::loadHTML($containedHtml);
}
return $pdf->output();
}