Project

General

Profile

Bug #32967 » bug_32967.diff

Changes in typo3_src-4.5.10/typo3/sysext/version/class.tx_version_tcemain.php which fixes bug for me - Jakob Berlin, 2012-01-04 17:54

View differences:

/Users/jakobberlin/Downloads/typo3_src-4.5.10/typo3/sysext/version/class.tx_version_tcemain.php 2011-12-20 11:29:43.000000000 +0100
// Select the two versions:
$curVersion = t3lib_BEfunc::getRecord($table, $id, '*');
$swapVersion = t3lib_BEfunc::getRecord($table, $swapWith, '*');
$movePlh = array();
$movePlhID = 0;
......
// Moving element.
if ((int)$TCA[$table]['ctrl']['versioningWS']>=2) { // && $t3ver_state['swapVersion']==4 // Maybe we don't need this?
if ($plhRec = t3lib_BEfunc::getMovePlaceholder($table, $id, 't3ver_state,pid,uid,colpos' . ($TCA[$table]['ctrl']['sortby'] ? ',' . $TCA[$table]['ctrl']['sortby'] : ''))) {
if ($plhRec = t3lib_BEfunc::getMovePlaceholder($table, $id, 't3ver_state,pid,uid' . ($TCA[$table]['ctrl']['sortby'] ? ',' . $TCA[$table]['ctrl']['sortby'] : ''))) {
$movePlhID = $plhRec['uid'];
$movePlh['pid'] = $swapVersion['pid'];
$swapVersion['pid'] = intval($plhRec['pid']);
......
$curVersion['t3ver_state'] = intval($swapVersion['t3ver_state']);
$swapVersion['t3ver_state'] = 0;
$swapVersion['colpos'] = $plhRec['colpos'];
if ($TCA[$table]['ctrl']['sortby']) {
// sortby is a "keepFields" which is why this will work...
$movePlh[$TCA[$table]['ctrl']['sortby']] = $swapVersion[$TCA[$table]['ctrl']['sortby']];
(4-4/4)