Merge pull request #825 from ezsystems/ezp-27050-draft_edit_user_2

Fix EZP-27050: Draft is kept after editing and publishing user

Author: yannickroger

Controller/Rest/ContentController.php

@@ -11,6 +11,7 @@
 use eZ\Publish\Core\REST\Server\Exceptions\BadRequestException;
 use eZ\Publish\Core\REST\Server\Values\RestContent;
 use eZ\Publish\Core\REST\Server\Values\Version;
+use eZ\Publish\Core\REST\Server\Values\CreatedVersion;
 use Symfony\Component\HttpFoundation\Request;
 use eZ\Publish\Core\REST\Common\Message;
 use eZ\Publish\Core\REST\Server\Controller\Content;
@@ -54,6 +55,28 @@ public function deleteContent($contentId)
         return new NoContent();
     }
 
+    public function createDraftFromCurrentVersion($contentId)
+    {
+        if (!$this->isUserContent($contentId)) {
+            return parent::createDraftFromCurrentVersion($contentId);
+        }
+
+        // Not creating the draft in this method as it will be created later by `updateVersion` and returning a dummy version
+        $content = $this->repository->getUserService()->loadUser($contentId);
+        $contentInfo = $this->repository->getContentService()->loadContentInfo($contentId);
+        $contentType = $this->repository->getContentTypeService()->loadContentType($contentInfo->contentTypeId);
+
+        return new CreatedVersion(
+            array(
+                'version' => new Version(
+                    $content,
+                    $contentType,
+                    []
+                ),
+            )
+        );
+    }
+
     /**
      * If the updated content is a user, update it using the user API, and return a Version object.
      *