[TASK] Move NotFound icons to EXT:core 07/41007/2
authorBenjamin Mack <benni@typo3.org>
Wed, 8 Jul 2015 20:45:32 +0000 (22:45 +0200)
committerHelmut Hummel <helmut.hummel@typo3.org>
Thu, 9 Jul 2015 06:46:55 +0000 (08:46 +0200)
Resolves: #67990
Releases: master
Change-Id: I171fb2f5bfdf237fc61001a3158e38599b00756b
Reviewed-on: http://review.typo3.org/41007
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Reviewed-by: Helmut Hummel <helmut.hummel@typo3.org>
Tested-by: Helmut Hummel <helmut.hummel@typo3.org>
typo3/gfx/notfound_thumb.gif [deleted file]
typo3/gfx/notfound_thumb.png [deleted file]
typo3/sysext/backend/Classes/View/ThumbnailView.php
typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
typo3/sysext/core/Resources/Public/Images/NotFound.gif [new file with mode: 0644]
typo3/sysext/core/Resources/Public/Images/NotFound.png [new file with mode: 0644]

diff --git a/typo3/gfx/notfound_thumb.gif b/typo3/gfx/notfound_thumb.gif
deleted file mode 100644 (file)
index 001ae5d..0000000
Binary files a/typo3/gfx/notfound_thumb.gif and /dev/null differ
diff --git a/typo3/gfx/notfound_thumb.png b/typo3/gfx/notfound_thumb.png
deleted file mode 100644 (file)
index 1fd58ae..0000000
Binary files a/typo3/gfx/notfound_thumb.png and /dev/null differ
index 7a4bee0..379ce2d 100644 (file)
@@ -263,12 +263,13 @@ class ThumbnailView {
                        throw new \RuntimeException('TYPO3 Fatal Error: No gdlib. ' . $l1 . ' ' . $l2 . ' ' . $l3, 1270853954);
                }
                // Creates the basis for the error image
+               $basePath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('core') . 'Resources/Public/Images/';
                if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['gdlib_png']) {
                        header('Content-type: image/png');
-                       $im = imagecreatefrompng(PATH_typo3 . 'gfx/notfound_thumb.png');
+                       $im = imagecreatefrompng($basePath . 'NotFound.png');
                } else {
                        header('Content-type: image/gif');
-                       $im = imagecreatefromgif(PATH_typo3 . 'gfx/notfound_thumb.gif');
+                       $im = imagecreatefromgif($basePath . 'NotFound.gif');
                }
                // Sets background color and print color.
                $white = imageColorAllocate($im, 255, 255, 255);
index 1be1e54..cb7f70b 100644 (file)
@@ -2995,10 +2995,11 @@ class GraphicalFunctions {
                        throw new \RuntimeException('TYPO3 Fatal Error: No gdlib. ' . $textline1 . ' ' . $textline2 . ' ' . $textline3, 1270853952);
                }
                // Creates the basis for the error image
+               $basePath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('core') . 'Resources/Public/Images/';
                if (!empty($GLOBALS['TYPO3_CONF_VARS']['GFX']['gdlib_png'])) {
-                       $im = imagecreatefrompng(PATH_typo3 . 'gfx/notfound_thumb.png');
+                       $im = imagecreatefrompng($basePath . 'NotFound.png');
                } else {
-                       $im = imagecreatefromgif(PATH_typo3 . 'gfx/notfound_thumb.gif');
+                       $im = imagecreatefromgif($basePath . 'NotFound.gif');
                }
                // Sets background color and print color.
                $white = imageColorAllocate($im, 255, 255, 255);
diff --git a/typo3/sysext/core/Resources/Public/Images/NotFound.gif b/typo3/sysext/core/Resources/Public/Images/NotFound.gif
new file mode 100644 (file)
index 0000000..001ae5d
Binary files /dev/null and b/typo3/sysext/core/Resources/Public/Images/NotFound.gif differ
diff --git a/typo3/sysext/core/Resources/Public/Images/NotFound.png b/typo3/sysext/core/Resources/Public/Images/NotFound.png
new file mode 100644 (file)
index 0000000..1fd58ae
Binary files /dev/null and b/typo3/sysext/core/Resources/Public/Images/NotFound.png differ