bug_32967.diff
| /Users/jakobberlin/Downloads/typo3_src-4.5.10/typo3/sysext/version/class.tx_version_tcemain.php 2011-12-20 11:29:43.000000000 +0100 | ||
|---|---|---|
| 749 | 749 |
// Select the two versions: |
| 750 | 750 |
$curVersion = t3lib_BEfunc::getRecord($table, $id, '*'); |
| 751 | 751 |
$swapVersion = t3lib_BEfunc::getRecord($table, $swapWith, '*'); |
| 752 | ||
| 753 | 752 |
$movePlh = array(); |
| 754 | 753 |
$movePlhID = 0; |
| 755 | 754 | |
| ... | ... | |
| 827 | 826 | |
| 828 | 827 |
// Moving element. |
| 829 | 828 |
if ((int)$TCA[$table]['ctrl']['versioningWS']>=2) { // && $t3ver_state['swapVersion']==4 // Maybe we don't need this?
|
| 830 |
if ($plhRec = t3lib_BEfunc::getMovePlaceholder($table, $id, 't3ver_state,pid,uid,colpos' . ($TCA[$table]['ctrl']['sortby'] ? ',' . $TCA[$table]['ctrl']['sortby'] : ''))) {
|
|
| 829 |
if ($plhRec = t3lib_BEfunc::getMovePlaceholder($table, $id, 't3ver_state,pid,uid' . ($TCA[$table]['ctrl']['sortby'] ? ',' . $TCA[$table]['ctrl']['sortby'] : ''))) {
|
|
| 831 | 830 |
$movePlhID = $plhRec['uid']; |
| 832 | 831 |
$movePlh['pid'] = $swapVersion['pid']; |
| 833 | 832 |
$swapVersion['pid'] = intval($plhRec['pid']); |
| ... | ... | |
| 835 | 834 |
$curVersion['t3ver_state'] = intval($swapVersion['t3ver_state']); |
| 836 | 835 |
$swapVersion['t3ver_state'] = 0; |
| 837 | 836 | |
| 838 |
$swapVersion['colpos'] = $plhRec['colpos']; |
|
| 839 | ||
| 840 | 837 |
if ($TCA[$table]['ctrl']['sortby']) {
|
| 841 | 838 |
// sortby is a "keepFields" which is why this will work... |
| 842 | 839 |
$movePlh[$TCA[$table]['ctrl']['sortby']] = $swapVersion[$TCA[$table]['ctrl']['sortby']]; |