From 5e0fc7a2d815c96de6f6cdd081404df61e8ed886 Mon Sep 17 00:00:00 2001 From: Gabriel Bull Date: Wed, 12 Mar 2014 11:22:41 -0400 Subject: [PATCH] Fixed bug with new extension verification --- Classes/PHPWord/Writer/Word2007.php | 4 +--- Tests/_inc/TestHelperDOCX.php | 8 ++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Classes/PHPWord/Writer/Word2007.php b/Classes/PHPWord/Writer/Word2007.php index f58f2c43..8d112d47 100755 --- a/Classes/PHPWord/Writer/Word2007.php +++ b/Classes/PHPWord/Writer/Word2007.php @@ -199,8 +199,6 @@ class PHPWord_Writer_Word2007 implements PHPWord_Writer_IWriter */ private function checkContentTypes($src) { - $supportedImageTypes = array(IMAGETYPE_JPEG, IMAGETYPE_GIF, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM); - $extension = null; if (stripos(strrev($src), strrev('.php')) === 0) { $extension = 'php'; @@ -219,7 +217,7 @@ class PHPWord_Writer_Word2007 implements PHPWord_Writer_IWriter } } - if (in_array($extension, $supportedImageTypes)) { + if (isset($extension)) { $imageData = getimagesize($src); $imageType = image_type_to_mime_type($imageData[2]); $imageExtension = str_replace('.', '', image_type_to_extension($imageData[2])); diff --git a/Tests/_inc/TestHelperDOCX.php b/Tests/_inc/TestHelperDOCX.php index a368b8e4..2d59dcb6 100644 --- a/Tests/_inc/TestHelperDOCX.php +++ b/Tests/_inc/TestHelperDOCX.php @@ -59,4 +59,12 @@ class TestHelperDOCX rmdir($dir); } + + /** + * @return string + */ + public static function getFile() + { + return self::$file; + } } \ No newline at end of file