Fixed bug #7038: EM - sql_free_result() on non-resources fails

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2859 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index cc81005..110fda2 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2007-12-26  Oliver Hader  <oh@inpublica.de>
 
        * (minor) Fixed bug #6651: IRRE - Button for creating new records disappeared on nested child records if a parent record reached the maxitems value
+       * (tweak) Fixed bug #7038: EM - sql_free_result() on non-resources fails
 
 2007-12-21  Oliver Hader  <oh@inpublica.de>
 

diff --git a/t3lib/class.t3lib_install.php b/t3lib/class.t3lib_install.php
index 26b4af1..fcbf0bb 100755 (executable)
--- a/t3lib/class.t3lib_install.php
+++ b/t3lib/class.t3lib_install.php
@@ -743,7 +743,7 @@ class t3lib_install {
                                        $res = $GLOBALS['TYPO3_DB']->admin_query($string);
                                        if ($res === false)     {
                                                $result[$key] = $GLOBALS['TYPO3_DB']->sql_error();
-                                       } else {
+                                       } elseif (is_resource($res)) {
                                                $GLOBALS['TYPO3_DB']->sql_free_result($res);
                                        }
                                }