Index: typo3/sysext/cms/tslib/class.tslib_content.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_content.php	(revision 4403)
+++ typo3/sysext/cms/tslib/class.tslib_content.php	(working copy)
@@ -7244,7 +7244,12 @@
 			$types = t3lib_div::trimExplode(',',strtolower($conf['allow']),1);
 			$allow = array_flip($types);
 
-			$perms = $GLOBALS['BE_USER']->calcPerms($GLOBALS['TSFE']->page);
+			if ($conf['permissionCheckOnPid'] == 'pid' || $permsCheckPid = intval($conf['permissionCheckOnPid'])) {
+				$editpanelPermissionPage = ($conf['permissionCheckOnPid'] == 'pid') ? $GLOBALS['TSFE']->sys_page->getPage_noCheck($dataArr['pid']) : $GLOBALS['TSFE']->sys_page->getPage_noCheck($permsCheckPid);
+			} else {
+				$editpanelPermissionPage = $GLOBALS['TSFE']->page;
+			}
+			$perms = $GLOBALS['BE_USER']->calcPerms($editpanelPermissionPage);
 			if ($table=='pages')	{
 				if (count($GLOBALS['TSFE']->config['rootLine'])==1)	{unset($allow['move']); unset($allow['hide']); unset($allow['delete']);}	// rootpage!
 				if (!($perms&2))	{unset($allow['edit']);unset($allow['move']);unset($allow['hide']);}