Merge pull request ezsystems#1128 from yannoz/master

Fix EZP-23822: PathPrefix in ezpLanguageSwitcher
ezpublishlegacy · Dec 19, 2014 · 2ffed2e · 2ffed2e
2 parents 4f2f457 + e2888c7
commit 2ffed2e
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/kernel/private/classes/ezplanguageswitcher.php b/kernel/private/classes/ezplanguageswitcher.php
@@ -51,7 +51,6 @@ function __construct( $params = null )
     /**
      * Get instance siteaccess specific site.ini
      *
-     * @param string $sa
      * @return void
      */
     protected function getSiteAccessIni()
@@ -142,7 +141,7 @@ protected static function removePathPrefixIfNeeded( eZINI $saIni, &$url )
             $pathPrefix = $saIni->variable( 'SiteAccessSettings', 'PathPrefix' );
             if ( !empty( $pathPrefix ) )
             {
-                if ( strpos( $url, $pathPrefix . '/' ) === 0 )
+                if ( ( strpos( $url, $pathPrefix . '/' ) === 0 ) || ( $pathPrefix === $url ) )
                 {
                     $url = substr( $url, strlen( $pathPrefix ) + 1 );
                 }
@@ -159,8 +158,6 @@ protected static function removePathPrefixIfNeeded( eZINI $saIni, &$url )
     /**
      * Returns URL alias for the specified <var>$locale</var>
      *
-     * @param string $url
-     * @param string $locale
      * @return void
      */
     public function destinationUrl()