Skip to content

Commit 6013cc4

Browse files
authored
Merge pull request #334 from cosmocode/mpdf7.0.3
update the mpdf library to 7.0.3
2 parents a058783 + 9d0ba8b commit 6013cc4

File tree

321 files changed

+12418
-9405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

321 files changed

+12418
-9405
lines changed

DokuImageProcessorDecorator.class.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
namespace dokuwiki\plugin\dw2pdf;
4+
35
class DokuImageProcessorDecorator extends \Mpdf\Image\ImageProcessor {
46

57
/**
@@ -62,8 +64,10 @@ public static function adjustGetImageLinks($file, $orig_srcpath) {
6264
//check permissions (namespace only)
6365
if(auth_quickaclcheck(getNS($media) . ':X') < AUTH_READ) {
6466
$file = '';
67+
$local = '';
68+
} else {
69+
$local = mediaFN($media, $rev);
6570
}
66-
$local = mediaFN($media, $rev);
6771
}
6872

6973
//handle image resizing/cropping

_test/DokuImageProcessor.test.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
require_once __DIR__ . '/../vendor/autoload.php';
44
require __DIR__ . '/../DokuImageProcessorDecorator.class.php';
55

6+
use dokuwiki\plugin\dw2pdf\DokuImageProcessorDecorator;
7+
68
/**
79
* General tests for the imagemap plugin
810
*
@@ -55,7 +57,7 @@ public function provideGetImageTestdata() {
5557
public function testGetImage($input_file, $input_orig_srcpath, $expected_file, $expected_orig_srcpath, $msg)
5658
{
5759

58-
list($actual_file, $actual_orig_srcpath) = \DokuImageProcessorDecorator::adjustGetImageLinks($input_file,
60+
list($actual_file, $actual_orig_srcpath) = DokuImageProcessorDecorator::adjustGetImageLinks($input_file,
5961
$input_orig_srcpath);
6062

6163
$this->assertEquals($expected_file, $actual_file, '$file ' . $msg);

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
}
88
],
99
"require": {
10-
"mpdf/mpdf": "dev-development"
10+
"mpdf/mpdf": "7.0.3"
1111
},
1212
"replace": {
1313
"paragonie/random_compat": "*"

composer.lock

Lines changed: 10 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)