[BUGFIX] reference to OpenID lib to wrong directory
authorJigal van Hemert <jigal@xs4all.nl>
Sat, 25 Aug 2012 14:02:42 +0000 (16:02 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sat, 25 Aug 2012 14:18:10 +0000 (16:18 +0200)
sysext/openid/sv1/class.tx_openid_store.php needs to load Interface.php
from sysext/openid/lib/php-openid/Auth/OpenID

Change-Id: Ibd040146234e54b9588824ec9e2db13d14a40f0d
Fixes: #40187
Related: #40095
Related: #40162
Releases: 6.0
Reviewed-on: http://review.typo3.org/14082
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/openid/Classes/OpenidService.php
typo3/sysext/openid/sv1/class.tx_openid_store.php

index 2ef6fb6..e39bbd2 100644 (file)
@@ -220,7 +220,7 @@ class OpenidService extends \TYPO3\CMS\Core\Service\AbstractService {
                        self::$openIDLibrariesIncluded = TRUE;
                        // PHP OpenID libraries requires adjustments of path settings
                        $oldIncludePath = get_include_path();
-                       $phpOpenIDLibPath = PATH_typo3 . 'contrib/openid';
+                       $phpOpenIDLibPath = \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('openid') . 'lib/php-openid';
                        @set_include_path((((((($phpOpenIDLibPath . PATH_SEPARATOR) . $phpOpenIDLibPath) . PATH_SEPARATOR) . 'Auth') . PATH_SEPARATOR) . $oldIncludePath));
                        // Make sure that random generator is properly set up. Constant could be
                        // defined by the previous inclusion of the file
index 5ff962b..71f0765 100644 (file)
@@ -21,7 +21,7 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-require_once PATH_typo3 . 'contrib/openid/Auth/OpenID/Interface.php';
+require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('openid') . 'lib/php-openid/Auth/OpenID/Interface.php';
 /*
  * @deprecated since 6.0, the classname tx_openid_store and this file is obsolete
  * and will be removed by 7.0. The class was renamed and is now located at: