make t3lib_svbase abstract and remove unused references to T3_VAR
authorMartin Kutschker <martin.t.kutschker@blackbox.net>
Thu, 16 Oct 2008 15:11:12 +0000 (15:11 +0000)
committerMartin Kutschker <martin.t.kutschker@blackbox.net>
Thu, 16 Oct 2008 15:11:12 +0000 (15:11 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4317 709f56b5-9817-0410-a4d7-c38de5d9e867

t3lib/class.t3lib_extmgm.php
t3lib/class.t3lib_svbase.php

index 5f5ab54..a0141f0 100644 (file)
@@ -568,7 +568,7 @@ final class t3lib_extMgm {
         * @author      Ren´┐Ż Fritz <r.fritz@colorcube.de>
         */
        public static function findService($serviceType, $serviceSubType = '', $excludeServiceKeys = array()) {
-               global $T3_SERVICES, $T3_VAR, $TYPO3_CONF_VARS;
+               global $T3_SERVICES, $TYPO3_CONF_VARS;
 
                $serviceKey = FALSE;
                $serviceInfo = FALSE;
index f779295..2f778ec 100755 (executable)
@@ -122,7 +122,7 @@ require_once(PATH_t3lib.'class.t3lib_exec.php');
  * @package TYPO3
  * @subpackage t3lib
  */
-class t3lib_svbase {
+abstract class t3lib_svbase {
 
        /**
         * service description array
@@ -222,11 +222,9 @@ class t3lib_svbase {
         * @return      mixed           configuration value for the service
         */
        function getServiceOption($optionName, $defaultValue='', $includeDefaultConfig=TRUE) {
-               global $TYPO3_CONF_VARS;
-
                $config = NULL;
 
-               $svOptions = $TYPO3_CONF_VARS['SVCONF'][$this->info['serviceType']];
+               $svOptions = $GLOBALS['TYPO3_CONF_VARS']['SVCONF'][$this->info['serviceType']];
 
                if(isset($svOptions[$this->info['serviceKey']][$optionName])) {
                        $config = $svOptions[$this->info['serviceKey']][$optionName];
@@ -375,8 +373,6 @@ class t3lib_svbase {
         * @return      boolean         return FALSE if one program was not found
         */
        function checkExec($progList) {
-               global $T3_VAR, $TYPO3_CONF_VARS;
-
                $ret = TRUE;
 
                require_once(PATH_t3lib.'class.t3lib_exec.php');