Skip to content

Add parsing of html image in base64 format #1382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 30, 2018
Merged

Add parsing of html image in base64 format #1382

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
58c6c52
merged with local version
May 23, 2018
d54cc6e
fix lint
May 23, 2018
a228811
fixes
May 23, 2018
46b7bea
increased test coverage of new lines
May 24, 2018
a89e4c9
added exception control to file_get_contents error
May 25, 2018
65a594d
cs-fixer fixes
May 25, 2018
da604a8
use annotation instead
troosan May 27, 2018
c22f7ea
add check on opened file
troosan May 27, 2018
b2cafff
Merge remote-tracking branch 'upstream/develop' into develop_upstream
troosan May 30, 2018
e764871
update changelog
troosan May 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cs-fixer fixes
  • Loading branch information
Javier Garcia committed May 25, 2018
commit 65a594d2713b6ff876ca0a1d230404a0d160b6c9
10 changes: 5 additions & 5 deletions src/PhpWord/Shared/Html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ private static function parseImage($node, $element)
break;
}
}
$origin_src= $src;
$originSrc = $src;
if (strpos($src, 'data:image') !== false) {
$tmpDir = Settings::getTempDir() . '/';

Expand Down Expand Up @@ -692,10 +692,10 @@ private static function parseImage($node, $element)
}
}

if (is_file($src)){
$newElement = $element->addImage($src, $style);
}else{
throw new \Exception("Could not load image $origin_src");
if (is_file($src)) {
$newElement = $element->addImage($src, $style);
} else {
throw new \Exception("Could not load image $originSrc");
}

return $newElement;
Expand Down