Index: kernel/content/versionview.php
===================================================================
--- kernel/content/versionview.php	(revision 25281)
+++ kernel/content/versionview.php	(working copy)
@@ -1,10 +1,15 @@
 <?php
+/**
+###JAC_PATCH_G_06_EZ_4.3.0###
+- kernel/content/versionview.php
+*/
+
 //
 // Created on: <03-May-2002 15:17:01 bf>
 //
 // ## BEGIN COPYRIGHT, LICENSE AND WARRANTY NOTICE ##
 // SOFTWARE NAME: eZ Publish
-// SOFTWARE RELEASE: 4.1.x
+// SOFTWARE RELEASE: 4.3.0
 // COPYRIGHT NOTICE: Copyright (C) 1999-2010 eZ Systems AS
 // SOFTWARE LICENSE: GNU General Public License v2.0
 // NOTICE: >
@@ -260,17 +265,52 @@
     }
 }
 
-$access = $GLOBALS['eZCurrentAccess'];
-$access['name'] = $siteAccess;
+/*
+    ####JAC_PATCH_G_06_EZ_4.0.1###
 
-if ( $access['type'] == EZ_ACCESS_TYPE_URI )
+    To get the right INIOverrideDirList we have do do something
+    1. We delete all entry how are related to the admin siteaccess which want to diplay an ini setting from another siteaccess
+    2. change to new siteaccess using the global inis
+    3. Load the new siteaccess extensions
+*/
+if( $GLOBALS['eZCurrentAccess']['name'] != $siteAccess )
 {
-    eZSys::clearAccessPath();
+    $access = $GLOBALS['eZCurrentAccess'];
+    $access['name'] = $siteAccess;
+
+    if ( $access['type'] == EZ_ACCESS_TYPE_URI )
+    {
+        eZSys::clearAccessPath();
+    }
+    // 1. delete all entry which are related to the old siteaccess
+    $newINIOverrideDirList = array();
+    foreach ( array_reverse( $GLOBALS['eZINIOverrideDirList'] ) as $dir )
+    {
+        $path = $dir[0];
+        if( ereg('siteaccess', $path) )
+        {
+            break;
+        }
+        else
+        {
+            $newINIOverrideDirList[] = $dir;
+        }
+    }
+    $iniOverrideDirListWithoutSiteaccess = array_reverse( $newINIOverrideDirList );
+
+    $GLOBALS['eZINIOverrideDirList'] = $iniOverrideDirListWithoutSiteaccess;
+
+    // 2. change to new siteaccess using the global inis
+    changeAccess( $access );
+
+    // 3. Load the new siteaccess extensions
+    eZExtension::activateExtensions( 'access' );
 }
-changeAccess( $access );
 
-// Load the siteaccess extensions
-eZExtension::activateExtensions( 'access' );
+// eZTemplateDesignResourceInstance::createOverrideCache() create wrong override dir cache => disable
+$GLOBALS['eZSiteBasics']['no-cache-adviced'] = true;
+unset( $GLOBALS['eZTemplateDesignResourceInstance'] );
+
 
 // Change content object default language
 $GLOBALS['eZContentObjectDefaultLanguage'] = $LanguageCode;