BUG Fix WasDraft not being written

silverstripe · Mar 13, 2018 · 0be2a9d · 0be2a9d
1 parent 35cff90
commit 0be2a9d
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/src/Versioned.php b/src/Versioned.php
@@ -950,7 +950,6 @@ protected function augmentWriteVersioned(&$manipulation, $class, $table, $record
         $nextVersion = $nextVersion ?: 1;
 
         if ($class === $baseDataClass) {
-            $appliesToStages = is_array($stages) ? $stages : [$stages];
             // Write AuthorID for baseclass
             if ((Security::getCurrentUser())) {
                 $userID = Security::getCurrentUser()->ID;
@@ -962,8 +961,8 @@ protected function augmentWriteVersioned(&$manipulation, $class, $table, $record
                 [
                     'AuthorID' => $userID,
                     'PublisherID' => $userID,
-                    'WasPublished' => (int)in_array(static::LIVE, $appliesToStages),
-                    'WasDraft' => (int)in_array(static::DRAFT, $appliesToStages),
+                    'WasPublished' => (int)in_array(static::LIVE, (array)$stages),
+                    'WasDraft' => (int)in_array(static::DRAFT, (array)$stages),
                     'WasDeleted' => (int)$isDelete,
                 ]
             );
@@ -1079,14 +1078,11 @@ public function augmentWrite(&$manipulation)
                 // Putting a Version of -1 is a signal to leave the version table alone, despite their being no version
                 unset($manipulation[$table]['fields']['Version']);
             } else {
-                $this->augmentWriteVersioned(
-                    $manipulation,
-                    $class,
-                    $table,
-                    $id,
-                    [static::get_stage()],
-                    false
-                );
+                // All writes are to draft, only live affect both
+                $stages = static::get_stage() === static::LIVE
+                    ? [self::DRAFT, self::LIVE]
+                    : [self::DRAFT];
+                $this->augmentWriteVersioned($manipulation, $class, $table, $id, $stages, false);
             }
 
             // Remove "Version" column from subclasses of baseDataClass