Follow-up to bug #11156: Fixed further misbehaviour of includeLibs in frontend

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5459 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index c41842d..c2004e8 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
        * Follow-up to feature #9633: XCLASSes did not work for autoloaded class files
        * Fixed bug #11156: Misbehaviours due to integration of autoloader (XCLASSes)
        * Fixed bug #11156: Misbehaviours due to integration of autoloader (includeLibs in frontend)
+       * Follow-up to bug #11156: Fixed further misbehaviour of includeLibs in frontend
 
 2009-05-20  Steffen Kamper  <info@sk-typo3.de>
 

diff --git a/t3lib/class.t3lib_div.php b/t3lib/class.t3lib_div.php
index 930940f..4006fdf 100644 (file)
--- a/t3lib/class.t3lib_div.php
+++ b/t3lib/class.t3lib_div.php
@@ -4809,18 +4809,13 @@ final class t3lib_div {
         * Usage: 17
         *
         * @param       string          Base Class name to evaluate
-        * @return      mixed           Final class name to instantiate with "new [classname]" (string)
-        *                                              or false (boolean) if even original class name could not be found
+        * @return      string          Final class name to instantiate with "new [classname]"
         * @deprecated since TYPO3 4.3 - Use t3lib_div::makeInstance('myClass', $arg1, $arg2,  ..., $argN)
         */
        public static function makeInstanceClassName($className)        {
                self::logDeprecatedFunction();
 
-               $result = false;
-               if (class_exists($className)) {
-                       $result = (class_exists('ux_'.$className) ? t3lib_div::makeInstanceClassName('ux_' . $className) : $className);
-               }
-               return $result;
+               return (class_exists($className) && class_exists('ux_'.$className) ? t3lib_div::makeInstanceClassName('ux_' . $className) : $className);
        }
 
        /**
@@ -4828,15 +4823,10 @@ final class t3lib_div {
         * class-extension API.
         *
         * @param       string          Base class name to evaluate
-        * @return      mixed           Final class name to instantiate with "new [classname]" (string)
-        *                                              or false (boolean) if even original class name could not be found
+        * @return      mixed           Final class name to instantiate with "new [classname]"
         */
        protected function getClassName($className) {
-               $result = false;
-               if (class_exists($className)) {
-                       $result = (class_exists('ux_' . $className) ? self::getClassName('ux_' . $className) : $className);
-               }
-               return $result;
+               return (class_exists($className) && class_exists('ux_' . $className) ? self::getClassName('ux_' . $className) : $className);
        }
 
        /**