diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-12-20 14:09:08 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-12-20 14:09:08 +0000 |
| commit | d44668f6cee02a5ac8030fd9e0fe2e7fdf2217ce (patch) | |
| tree | 547731aa5d6df60cdb20a2c9256072af9e1dfaa4 /vendor/tecnickcom/tcpdf | |
| parent | d6d267bde52d522e3889574798ca4315da9009b4 (diff) | |
| download | webtrees-d44668f6cee02a5ac8030fd9e0fe2e7fdf2217ce.tar.gz webtrees-d44668f6cee02a5ac8030fd9e0fe2e7fdf2217ce.tar.bz2 webtrees-d44668f6cee02a5ac8030fd9e0fe2e7fdf2217ce.zip | |
Fix: #2777 tcpdf seems abandoned - apply patches locally
Diffstat (limited to 'vendor/tecnickcom/tcpdf')
| -rw-r--r-- | vendor/tecnickcom/tcpdf/PATCHES.txt | 7 | ||||
| -rw-r--r-- | vendor/tecnickcom/tcpdf/tcpdf.php | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/vendor/tecnickcom/tcpdf/PATCHES.txt b/vendor/tecnickcom/tcpdf/PATCHES.txt new file mode 100644 index 0000000000..187d5efd41 --- /dev/null +++ b/vendor/tecnickcom/tcpdf/PATCHES.txt @@ -0,0 +1,7 @@ +This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches) +Patches applied to this directory: + +PR #137 +Source: https://github.com/tecnickcom/TCPDF/commit/0c73a9c580246b6f4e2eea196f0e4759f79ad632.patch + + diff --git a/vendor/tecnickcom/tcpdf/tcpdf.php b/vendor/tecnickcom/tcpdf/tcpdf.php index 0ee30bc0d1..4dedf41ff2 100644 --- a/vendor/tecnickcom/tcpdf/tcpdf.php +++ b/vendor/tecnickcom/tcpdf/tcpdf.php @@ -4715,14 +4715,14 @@ class TCPDF { * Defines the page and position a link points to. * @param $link (int) The link identifier returned by AddLink() * @param $y (float) Ordinate of target position; -1 indicates the current position. The default value is 0 (top of page) - * @param $page (int) Number of target page; -1 indicates the current page (default value). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages. + * @param $page (int|string) Number of target page; -1 indicates the current page (default value). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages. * @public * @since 1.5 * @see AddLink() */ public function SetLink($link, $y=0, $page=-1) { $fixed = false; - if (!empty($page) AND ($page[0] == '*')) { + if (!empty($page) AND is_string($page) AND ($page[0] == '*')) { $page = intval(substr($page, 1)); // this page number will not be changed when moving/add/deleting pages $fixed = true; |
