Fixed bug #9469: Failed to load magic database
authorDmitry Dulepov <dmitry.dulepov@gmail.com>
Fri, 10 Oct 2008 07:49:54 +0000 (07:49 +0000)
committerDmitry Dulepov <dmitry.dulepov@gmail.com>
Fri, 10 Oct 2008 07:49:54 +0000 (07:49 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4304 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/class.tslib_pagegen.php

index 40a215d..8333073 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2008-10-10  Dmitry Dulepov  <dmitry@typo3.org>
 
        * Fixed bug #9522: t3lib_BEfunc::BEenableFields generates invalid SQL
+       * Fixed bug #9469: Failed to load magic database
 
 2008-10-08  Stanislas Rolland  <typo3@sjbr.ca>
 
index 80b88a2..04ca721 100755 (executable)
@@ -486,9 +486,10 @@ See <a href="http://wiki.typo3.org/index.php/TYPO3_3.8.1" target="_blank">wiki.t
                        $favIcon = t3lib_div::getIndpEnv('TYPO3_SITE_URL') . $GLOBALS['TSFE']->tmpl->getFileName($GLOBALS['TSFE']->pSetup['shortcutIcon']);
                        $iconMimeType = '';
                        if (function_exists('finfo_open')) {
-                               $finfo = finfo_open(FILEINFO_MIME);
-                               $iconMimeType = ' type="'.finfo_file($finfo,$favIcon).'"';
-                               finfo_close($finfo);
+                               if (($finfo = @finfo_open(FILEINFO_MIME))) {
+                                       $iconMimeType = ' type="' . finfo_file($finfo, $favIcon) . '"';
+                                       finfo_close($finfo);
+                               }
                        }
 
                        $GLOBALS['TSFE']->content.= '