Index: typo3/mod/user/ws/class.wslib_gui.php
===================================================================
--- typo3/mod/user/ws/class.wslib_gui.php	(Revision 8791)
+++ typo3/mod/user/ws/class.wslib_gui.php	(Arbeitskopie)
@@ -206,10 +206,10 @@
 			if ($GLOBALS['BE_USER']->workspace !== 0) {
 				$tableHeader .= '<option value="release">' . $LANG->getLL('label_doaction_release') . '</option>';
 			}
-			$tableHeader .= $GLOBALS['BE_USER']->workspaceCheckStageForCurrent('-1') ? '<option value="stage_-1">' . $LANG->getLL('label_doaction_stage_reject') . '</option>' : '';
-			$tableHeader .= $GLOBALS['BE_USER']->workspaceCheckStageForCurrent('0') ? '<option value="stage_0">' . $LANG->getLL('label_doaction_stage_editing') . '</option>' : '';
-			$tableHeader .= $GLOBALS['BE_USER']->workspaceCheckStageForCurrent('1') ? '<option value="stage_1">' . $LANG->getLL('label_doaction_stage_review') . '</option>' : '';
-			$tableHeader .= $GLOBALS['BE_USER']->workspaceCheckStageForCurrent('10') ? '<option value="stage_10">' . $LANG->getLL('label_doaction_stage_publish') . '</option>' : '';
+			$tableHeader .= '<option value="stage_-1">' . $LANG->getLL('label_doaction_stage_reject') . '</option>';
+			$tableHeader .= $GLOBALS['BE_USER']->workspaceCheckStageForCurrent('-1') ? '<option value="stage_0">' . $LANG->getLL('label_doaction_stage_editing') . '</option>' : '';
+			$tableHeader .= $GLOBALS['BE_USER']->workspaceCheckStageForCurrent('0') ? '<option value="stage_1">' . $LANG->getLL('label_doaction_stage_review') . '</option>' : '';
+			$tableHeader .= $GLOBALS['BE_USER']->workspaceCheckStageForCurrent('1') ? '<option value="stage_10">' . $LANG->getLL('label_doaction_stage_publish') . '</option>' : '';
 
 			$tableHeader .= '<option value="flush">' . $LANG->getLL('label_doaction_flush') . '</option>
 					</select></td>
@@ -1260,7 +1260,7 @@
 
 		$raiseOk = !$GLOBALS['BE_USER']->workspaceCannotEditOfflineVersion($table,$rec_off);
 
-		if ($raiseOk && $rec_off['t3ver_stage'] != -1 && $GLOBALS['BE_USER']->workspaceCheckStageForCurrent($sId))	{
+		if ($raiseOk && $rec_off['t3ver_stage'] > 0 && $GLOBALS['BE_USER']->workspaceCheckStageForCurrent($rec_off['t3ver_stage'])) {
 			$onClick = 'var commentTxt=window.prompt("'.$LANG->getLL('explain_reject').'","");
 							if (commentTxt!=null) {window.location.href="'.$this->doc->issueCommand(
 			'&cmd['.$table.']['.$rec_off['uid'].'][version][action]=setStage'.
@@ -1282,21 +1282,20 @@
 		$actionLinks.= '<span style="background-color: '.$color.'; color: white;">'.$sLabel.'</span>';
 
 		// Raise
-		if ($raiseOk && $GLOBALS['BE_USER']->workspaceCheckStageForCurrent($sId))	{
+		if ($raiseOk && $rec_off['t3ver_stage'] < 10 && $GLOBALS['BE_USER']->workspaceCheckStageForCurrent($rec_off['t3ver_stage'])) {
 			$onClick = 'var commentTxt=window.prompt("'.$label.'","");
 							if (commentTxt!=null) {window.location.href="'.$this->doc->issueCommand(
 			'&cmd['.$table.']['.$rec_off['uid'].'][version][action]=setStage'.
 			'&cmd['.$table.']['.$rec_off['uid'].'][version][stageId]='.$sId
 			).'&cmd['.$table.']['.$rec_off['uid'].'][version][comment]="+escape(commentTxt);}'.
 			' return false;';
-			if ($rec_off['t3ver_stage']!=10)	{
-				$actionLinks.=
-				'<a href="#" onclick="'.htmlspecialchars($onClick).'">'.
-				'<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/up.gif','width="14" height="14"').' alt="" align="top" title="'.htmlspecialchars($titleAttrib).'" />'.
-				'</a>';
 
-				$this->stageIndex[$sId][$table][] = $rec_off['uid'];
-			}
+			$actionLinks .=
+			'<a href="#" onclick="' . htmlspecialchars($onClick) . '">' .
+			'<img' . t3lib_iconWorks::skinImg($this->doc->backPath, 'gfx/up.gif','width="14" height="14"') . ' alt="" align="top" title="' . htmlspecialchars($titleAttrib)  .'" />' .
+			'</a>';
+
+			$this->stageIndex[$sId][$table][] = $rec_off['uid'];
 		}
 
 		return $actionLinks;