Index: typo3/ajax.php =================================================================== --- typo3/ajax.php (revision 10275) +++ typo3/ajax.php (working copy) @@ -78,5 +78,5 @@ // outputting the content (and setting the X-JSON-Header) $ajaxObj->render(); - +t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); ?> \ No newline at end of file Index: typo3/classes/class.ajaxlogin.php =================================================================== --- typo3/classes/class.ajaxlogin.php (revision 10275) +++ typo3/classes/class.ajaxlogin.php (working copy) @@ -46,7 +46,6 @@ if ($GLOBALS['BE_USER']->user['uid']) { $formprotection = t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection'); $token = $formprotection->generateToken('extDirect'); - $formprotection->persistTokens(); $json = array( 'success' => TRUE, Index: typo3/mod.php =================================================================== --- typo3/mod.php (revision 10275) +++ typo3/mod.php (working copy) @@ -66,6 +66,4 @@ die('Value "' . htmlspecialchars($temp_M) . '" for "M" was not found as a module'); } -t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); - ?> \ No newline at end of file Index: typo3/template.php =================================================================== --- typo3/template.php (revision 10275) +++ typo3/template.php (working copy) @@ -430,7 +430,6 @@ t3lib_BEfunc::getUrlToken('tceAction') . '&prErr=1&uPT=1'; - t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); return $commandUrl; } @@ -927,7 +926,7 @@ ':'') . $this->endOfPageJsBlock ; - + t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); } @@ -1570,7 +1569,6 @@ $af_content = ''; if (count($opt)>1) { - t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); return $af_content; } } Index: typo3/db_new.php =================================================================== --- typo3/db_new.php (revision 10275) +++ typo3/db_new.php (working copy) @@ -733,6 +733,5 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); -t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); ?> Index: typo3/wizard_rte.php =================================================================== --- typo3/wizard_rte.php (revision 10275) +++ typo3/wizard_rte.php (working copy) @@ -339,6 +339,5 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); -t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); ?> Index: typo3/sysext/lowlevel/dbint/index.php =================================================================== --- typo3/sysext/lowlevel/dbint/index.php (revision 10275) +++ typo3/sysext/lowlevel/dbint/index.php (working copy) @@ -694,6 +694,5 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); -t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); ?> Index: typo3/sysext/cms/layout/db_layout.php =================================================================== --- typo3/sysext/cms/layout/db_layout.php (revision 10275) +++ typo3/sysext/cms/layout/db_layout.php (working copy) @@ -1413,6 +1413,5 @@ $SOBE->clearCache(); $SOBE->main(); $SOBE->printContent(); -t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); ?> \ No newline at end of file Index: typo3/sysext/info/mod1/index.php =================================================================== --- typo3/sysext/info/mod1/index.php (revision 10275) +++ typo3/sysext/info/mod1/index.php (working copy) @@ -233,6 +233,6 @@ $SOBE->main(); $SOBE->printContent(); -t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); + ?> \ No newline at end of file Index: typo3/sysext/taskcenter/task/index.php =================================================================== --- typo3/sysext/taskcenter/task/index.php (revision 10275) +++ typo3/sysext/taskcenter/task/index.php (working copy) @@ -534,6 +534,5 @@ $SOBE->main(); $SOBE->printContent(); -t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); ?> Index: typo3/sysext/perm/mod1/index.php =================================================================== --- typo3/sysext/perm/mod1/index.php (revision 10275) +++ typo3/sysext/perm/mod1/index.php (working copy) @@ -851,6 +851,5 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); -t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); ?> Index: typo3/sysext/version/cm1/index.php =================================================================== --- typo3/sysext/version/cm1/index.php (revision 10275) +++ typo3/sysext/version/cm1/index.php (working copy) @@ -1854,6 +1854,4 @@ $SOBE->main(); $SOBE->printContent(); -t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); - ?> \ No newline at end of file Index: typo3/sysext/version/ws/index.php =================================================================== --- typo3/sysext/version/ws/index.php (revision 10275) +++ typo3/sysext/version/ws/index.php (working copy) @@ -749,10 +749,10 @@ // $BE_USER->isInWebMount() to check mount points. $mountpointList = $GLOBALS['BE_USER']->groupData['webmounts']; // If there are DB mountpoints in the workspace record, - // then only show the ones that are allowed there (and that are in the users' webmounts) + // then only show the ones that are allowed there (and that are in the users' webmounts) if (trim($wksp['db_mountpoints'])) { $userMountpoints = explode(',', $mountpointList); - // now filter the users' to only keep the mountpoints + // now filter the users' to only keep the mountpoints // that are also in the workspaces' db_mountpoints $workspaceMountpoints = explode(',', $wksp['db_mountpoints']); $filteredMountpoints = array_intersect($userMountpoints, $workspaceMountpoints); @@ -803,10 +803,10 @@ // $BE_USER->isInWebMount() to check mount points. $mountpointList = implode(',', $GLOBALS['BE_USER']->groupData['filemounts']); // If there are file mountpoints in the workspace record, - // then only show the ones that are allowed there (and that are in the users' file mounts) + // then only show the ones that are allowed there (and that are in the users' file mounts) if (trim($wksp['file_mountpoints'])) { $userMountpoints = explode(',', $mountpointList); - // now filter the users' to only keep the mountpoints + // now filter the users' to only keep the mountpoints // that are also in the workspaces' file_mountpoints $workspaceMountpoints = explode(',', $wksp['file_mountpoints']); $filteredMountpoints = array_intersect($userMountpoints, $workspaceMountpoints); @@ -1091,6 +1091,4 @@ $SOBE->main(); $SOBE->printContent(); -t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); - ?> \ No newline at end of file Index: typo3/sysext/recordlist/mod1/index.php =================================================================== --- typo3/sysext/recordlist/mod1/index.php (revision 10275) +++ typo3/sysext/recordlist/mod1/index.php (working copy) @@ -513,6 +513,5 @@ $SOBE->clearCache(); $SOBE->main(); $SOBE->printContent(); -t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); ?> Index: typo3/move_el.php =================================================================== --- typo3/move_el.php (revision 10275) +++ typo3/move_el.php (working copy) @@ -466,6 +466,5 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); -t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); ?> Index: typo3/alt_menu.php =================================================================== --- typo3/alt_menu.php (revision 10275) +++ typo3/alt_menu.php (working copy) @@ -224,6 +224,5 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); -t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); ?> Index: typo3/alt_doc.php =================================================================== --- typo3/alt_doc.php (revision 10275) +++ typo3/alt_doc.php (working copy) @@ -1503,6 +1503,5 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); -$formprotection->persistTokens(); ?> Index: typo3/index.php =================================================================== --- typo3/index.php (revision 10275) +++ typo3/index.php (working copy) @@ -399,7 +399,6 @@ } else { $formprotection = t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection'); $token = $formprotection->generateToken('extDirect'); - $formprotection->persistTokens(); $TBE_TEMPLATE->JScode.=$TBE_TEMPLATE->wrapScriptTags(' if (parent.opener && (parent.opener.busy || parent.opener.TYPO3.loginRefresh)) { if (parent.opener.TYPO3.loginRefresh) { Index: typo3/alt_clickmenu.php =================================================================== --- typo3/alt_clickmenu.php (revision 10275) +++ typo3/alt_clickmenu.php (working copy) @@ -1776,5 +1776,5 @@ $SOBE->main(); $SOBE->printContent(); -t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection')->persistTokens(); + ?> Index: t3lib/class.t3lib_pagerenderer.php =================================================================== --- t3lib/class.t3lib_pagerenderer.php (revision 10275) +++ t3lib/class.t3lib_pagerenderer.php (working copy) @@ -949,7 +949,6 @@ if (TYPO3_MODE === 'BE') { $formprotection = t3lib_formprotection_Factory::get('t3lib_formprotection_BackendFormProtection'); $token = $formprotection->generateToken('extDirect'); - $formprotection->persistTokens(); } // Note: we need to iterate thru the object, because the addProvider method