Small cleanup in tslib (fixed use of uninitialized variables and added @var)
authorDmitry Dulepov <dmitry.dulepov@gmail.com>
Sat, 1 Mar 2008 12:40:39 +0000 (12:40 +0000)
committerDmitry Dulepov <dmitry.dulepov@gmail.com>
Sat, 1 Mar 2008 12:40:39 +0000 (12:40 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3334 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/class.tslib_content.php
typo3/sysext/cms/tslib/class.tslib_fe.php

index f866d15..e33b0a3 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-03-01  Dmitry Dulepov  <dmitry@typo3.org>
+
+       * Small cleanup in tslib (fixed use of uninitialized variables and added @var)
 
 2008-03-01  Martin Kutschker  <martin.t.kutschker@blackbox.net>
 
index e5a0f35..264e937 100755 (executable)
@@ -673,7 +673,7 @@ class tslib_cObj {
                                $substKey = $ext.'_SCRIPT.'.$GLOBALS['TSFE']->uniqueHash();
                                $content.='<!--'.$substKey.'-->';
                                $GLOBALS['TSFE']->config[$ext.'incScript'][$substKey] = array(
-                                       'file'=>$incFile,
+                                       'file' => $conf['includeLibs'],
                                        'conf'=>$conf,
                                        'cObj'=>serialize($this),
                                        'type'=>'COA'
@@ -709,7 +709,7 @@ class tslib_cObj {
                                $substKey = $ext.'_SCRIPT.'.$GLOBALS['TSFE']->uniqueHash();
                                $content.='<!--'.$substKey.'-->';
                                $GLOBALS['TSFE']->config[$ext.'incScript'][$substKey] = array(
-                                       'file' => $incFile,
+                                       'file' => $conf['includeLibs'],
                                        'conf' => $conf,
                                        'cObj' => serialize($this),
                                        'type' => 'FUNC'
index 3910b6a..f94d6ac 100755 (executable)
@@ -498,7 +498,7 @@ require_once (PATH_t3lib.'class.t3lib_lock.php');
                                        </script>';
                                exit;
                        }
-                       
+
                        if ($this->checkPageUnavailableHandler())       {
                                $this->pageUnavailableAndExit('The current username, password or host was not accepted when the connection to the database was attempted to be established!');
                        } else {
@@ -1339,7 +1339,7 @@ require_once (PATH_t3lib.'class.t3lib_lock.php');
                        return $this->sys_page->getDomainStartPage(t3lib_div::getIndpEnv('HTTP_HOST'),t3lib_div::getIndpEnv('SCRIPT_NAME'),t3lib_div::getIndpEnv('REQUEST_URI'));
                }
        }
-       
+
        /**
         * Page unavailable handler for use in frontend plugins from extensions.
         *
@@ -1365,7 +1365,7 @@ require_once (PATH_t3lib.'class.t3lib_lock.php');
                $this->pageNotFoundHandler($this->TYPO3_CONF_VARS['FE']['pageNotFound_handling'], $header, $reason);
                exit;
        }
-       
+
        /**
         * Checks whether the pageUnavailableHandler should be used. To be used, pageUnavailable_handling must be set
         * and devIPMask must not match the current visitor's IP address.
@@ -1379,10 +1379,10 @@ require_once (PATH_t3lib.'class.t3lib_lock.php');
                } else {
                        $checkPageUnavailableHandler = FALSE;
                }
-               
+
                return $checkPageUnavailableHandler;
        }
-       
+
        /**
         * Page unavailable handler. Acts a wrapper for the pageErrorHandler method.
         *
@@ -1394,7 +1394,7 @@ require_once (PATH_t3lib.'class.t3lib_lock.php');
        function pageUnavailableHandler($code, $header, $reason)        {
                $this->pageErrorHandler($code, $header, $reason);
        }
-       
+
        /**
         * Page not found handler. Acts a wrapper for the pageErrorHandler method.
         *
@@ -2864,7 +2864,7 @@ require_once (PATH_t3lib.'class.t3lib_lock.php');
                        unset($lockObj);
                        // Otherwise, if caching is disabled, no locking is required:
                } elseif ($this->no_cache || $this->headerNoCache()) {
-                       $success = true; 
+                       $success = true;
                }
                return $success;
        }
@@ -3104,6 +3104,7 @@ require_once (PATH_t3lib.'class.t3lib_lock.php');
                                $incContent='';
                                if (is_array($INTiS_config[$INTiS_key]))        {
                                        $INTiS_cObj = unserialize($INTiS_config[$INTiS_key]['cObj']);
+                                       /* @var $INTiS_cObj tslib_cObj */
                                        $INTiS_cObj->INT_include=1;
                                        switch($INTiS_config[$INTiS_key]['type'])       {
                                                case 'SCRIPT':