Fixed bug #7874: Page lock not released when error page was generated
[Packages/TYPO3.CMS.git] / t3lib / class.t3lib_extobjbase.php
index 0a90355..9c782f3 100755 (executable)
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2004 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 1999-2008 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
 class t3lib_extobjbase {
 
        /**
-        * Contains a reference to the parent object.
+        * Contains a reference to the parent (calling) object (which is probably an instance of an extension class to t3lib_SCbase)
+        *
+        * @var t3lib_SCbase
         * @see init()
         */
        var $pObj;      // parent SC object
@@ -240,7 +242,9 @@ class t3lib_extobjbase {
                #       include($this->thisPath.'/'.$this->localLangFile);
                if ($this->localLangFile && (@is_file($this->thisPath.'/'.$this->localLangFile) || @is_file($this->thisPath.'/'.substr($this->localLangFile,0,-4).'.xml')))     {
                        $LOCAL_LANG = $LANG->includeLLFile($this->thisPath.'/'.$this->localLangFile, FALSE);
-                       if (is_array($LOCAL_LANG))      $GLOBALS['LOCAL_LANG'] = t3lib_div::array_merge_recursive_overrule($GLOBALS['LOCAL_LANG'],$LOCAL_LANG);
+                       if (is_array($LOCAL_LANG)) {
+                               $GLOBALS['LOCAL_LANG'] = t3lib_div::array_merge_recursive_overrule((array)$GLOBALS['LOCAL_LANG'], $LOCAL_LANG);
+                       }
                }
        }