Fixed bug #12508: Log usage of XLLfile to deprecation log (thanks to Steffen Gebert)
[Packages/TYPO3.CMS.git] / t3lib / class.t3lib_extobjbase.php
old mode 100755 (executable)
new mode 100644 (file)
index b07a64f..2b0e017
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2005 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 1999-2009 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
  *
  * Anyways, the final interesting thing is to see what the framework "func_wizard" actually does:
  *
- *     require_once(PATH_t3lib."class.t3lib_extobjbase.php");
  *     class tx_funcwizards_webfunc extends t3lib_extobjbase {
  *             var $localLangFile = "locallang.php";
  *             var $function_key = "wiz";
 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
@@ -197,7 +198,7 @@ class t3lib_extobjbase {
        function init(&$pObj,$conf)     {
                global $LANG;
 
-               $this->pObj = &$pObj;
+               $this->pObj = $pObj;
 
                        // Path of this script:
                $this->thisPath = dirname($conf['path']);
@@ -240,7 +241,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);
+                       }
                }
        }