fixed typo in description: htmlspecialchar[s]
authorRené Fritz <r.fritz@colorcube.de>
Tue, 3 May 2005 23:43:36 +0000 (23:43 +0000)
committerRené Fritz <r.fritz@colorcube.de>
Tue, 3 May 2005 23:43:36 +0000 (23:43 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@707 709f56b5-9817-0410-a4d7-c38de5d9e867

t3lib/class.t3lib_div.php

index b16c412..400d1ad 100755 (executable)
@@ -2546,7 +2546,7 @@ class t3lib_div {
        /**
         * Returns the link-url to the current script.
         * In $getParams you can set associative keys corresponding to the GET-vars you wish to add to the URL. If you set them empty, they will remove existing GET-vars from the current URL.
-        * REMEMBER to always htmlspecialchar() content in href-properties to ampersands get converted to entities (XHTML requirement and XSS precaution)
+        * REMEMBER to always htmlspecialchars() content in href-properties to ampersands get converted to entities (XHTML requirement and XSS precaution)
         * Usage: 52
         *
         * @param       array           Array of GET parameters to include
@@ -3543,27 +3543,27 @@ class t3lib_div {
                                $requireFile = t3lib_div::getFileAbsFileName($info['classFile']);
                                if (@is_file($requireFile)) {
                                        require_once ($requireFile);
-                                       $obj = t3lib_div::makeInstance($info['className']);
-                                       if (is_object($obj)) {
-                                               if(!@is_callable(array($obj,'init')))   {
-                                                               // use silent logging??? I don't think so.
-                                                       die ('Broken service:'.t3lib_div::view_array($info));
-                                               }
-                                               $obj->info = $info;
-                                               if ($obj->init()) { // service available?
+                               $obj = t3lib_div::makeInstance($info['className']);
+                               if (is_object($obj)) {
+                                       if(!@is_callable(array($obj,'init')))   {
+                                                       // use silent logging??? I don't think so.
+                                               die ('Broken service:'.t3lib_div::view_array($info));
+                                       }
+                                       $obj->info = $info;
+                                       if ($obj->init()) { // service available?
 
-                                                               // create persistent object
-                                                       $T3_VAR['makeInstanceService'][$info['className']] = &$obj;
+                                                       // create persistent object
+                                               $T3_VAR['makeInstanceService'][$info['className']] = &$obj;
 
-                                                               // needed to delete temp files
-                                                       register_shutdown_function(array(&$obj, '__destruct'));
+                                                       // needed to delete temp files
+                                               register_shutdown_function(array(&$obj, '__destruct'));
 
                                                        return $obj; // object is passed as reference by function definition
-                                               }
-                                               $error = $obj->getLastErrorArray();
-                                               unset($obj);
                                        }
+                                       $error = $obj->getLastErrorArray();
+                                       unset($obj);
                                }
+                       }
                        }
                                // deactivate the service
                        t3lib_extMgm::deactivateService($info['serviceType'],$info['serviceKey']);
@@ -3811,7 +3811,7 @@ class t3lib_div {
 
                if($command==='combine')        {       // This is only used internally, has no effect outside
                        $command = 'composite';
-               }
+}
 
                        // Compile the path & command
                if($im_version==='gm')  {