[TASK] Remove deprecated extDirect registration
authorChristian Kuhn <lolli@schwarzbu.ch>
Sat, 21 Apr 2012 12:39:15 +0000 (14:39 +0200)
committerTolleiv Nietsch <tolleiv.nietsch@typo3.org>
Sun, 22 Apr 2012 08:19:03 +0000 (10:19 +0200)
Change-Id: I87b4c4c4f4c7f5f2ff2f3af388a5b3dfb968eb6c
Resolves: #36408
Releases: 6.0
Reviewed-on: http://review.typo3.org/10673
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
Reviewed-by: Tolleiv Nietsch
Tested-by: Tolleiv Nietsch
t3lib/extjs/class.t3lib_extjs_extdirectapi.php
t3lib/extjs/class.t3lib_extjs_extdirectrouter.php

index 8cce304..dbe3970 100644 (file)
@@ -124,13 +124,6 @@ class t3lib_extjs_ExtDirectApi {
 
                                if (is_array($configuration)) {
                                        $className = $configuration['callbackClass'];
-                               } else {
-                                       t3lib_div::deprecationLog('ExtDirect (Namespace: ' . $javascriptName .
-                                               '): Registration code changed. Use the API method t3lib_extMgm::registerExtDirectComponent(). ' .
-                                               'More Information: http://wiki.typo3.org/ExtDirect ' .
-                                               'Will be removed in 4.7.'
-                                       );
-                                       $className = $configuration;
                                }
 
                                $serverObject = t3lib_div::getUserObj($className, FALSE);
index d478516..610be40 100644 (file)
@@ -144,6 +144,10 @@ class t3lib_extjs_ExtDirectRouter {
        protected function processRpc($singleRequest, $namespace) {
                $endpointName = $namespace . '.' . $singleRequest->action;
 
+               if (!isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ExtDirect'][$endpointName])) {
+                       throw new UnexpectedValueException('ExtDirect: Call to undefined endpoint: ' . $endpointName, 1294586450);
+               }
+
                if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ExtDirect'][$endpointName])) {
                        if (!isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ExtDirect'][$endpointName]['callbackClass'])) {
                                throw new UnexpectedValueException('ExtDirect: Call to undefined endpoint: ' . $endpointName, 1294586450);
@@ -161,18 +165,6 @@ class t3lib_extjs_ExtDirectRouter {
                                        TRUE
                                );
                        }
-
-               } else {
-                       if (!isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ExtDirect'][$endpointName])) {
-                               throw new UnexpectedValueException('ExtDirect: Call to undefined endpoint: ' . $endpointName, 1294586450);
-                       }
-
-                       $callbackClass = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ExtDirect'][$endpointName];
-                       t3lib_div::deprecationLog('ExtDirect (Namespace: ' . $endpointName .
-                               '): Registration code changed. Use the API method t3lib_extMgm::registerExtDirectComponent(). ' .
-                               'More Information: http://wiki.typo3.org/ExtDirect — ' .
-                               'Will be removed in 4.7.'
-                       );
                }
 
                $endpointObject = t3lib_div::getUserObj($callbackClass, FALSE);