From cbae6952f3b108b73003e5abb4520bccbb78a293 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Tue, 11 Aug 2020 20:35:59 +0300
Subject: [PATCH] fix(entries): fix wrong Implementation of Slug Field for
 Entries #452

---
 src/flextype/app/Foundation/Entries/Fields/CreatedAtField.php   | 2 +-
 src/flextype/app/Foundation/Entries/Fields/IdField.php          | 2 +-
 src/flextype/app/Foundation/Entries/Fields/ModifiedAtField.php  | 2 +-
 src/flextype/app/Foundation/Entries/Fields/PublishedAtField.php | 2 +-
 src/flextype/app/Foundation/Entries/Fields/SlugField.php        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/flextype/app/Foundation/Entries/Fields/CreatedAtField.php b/src/flextype/app/Foundation/Entries/Fields/CreatedAtField.php
index 2d64c82d..9793227e 100644
--- a/src/flextype/app/Foundation/Entries/Fields/CreatedAtField.php
+++ b/src/flextype/app/Foundation/Entries/Fields/CreatedAtField.php
@@ -13,7 +13,7 @@ if ($flextype->registry->get('flextype.settings.entries.fields.created_at.enable
     $flextype->emitter->addListener('onEntryAfterInitialized', function () use ($flextype) : void {
         $flextype->entries->entry['created_at'] = isset($flextype->entries->entry['created_at']) ?
                                         (int) strtotime($flextype->entries->entry['created_at']) :
-                                        (int) Filesystem::getTimestamp($flextype->entries->getFileLocation($flextype->entries->entry_path));
+                                        (int) Filesystem::getTimestamp($flextype->entries->getFileLocation($flextype->entries->entry_id));
     });
 
     $flextype->emitter->addListener('onEntryCreate', function () use ($flextype) : void {
diff --git a/src/flextype/app/Foundation/Entries/Fields/IdField.php b/src/flextype/app/Foundation/Entries/Fields/IdField.php
index ad5ef9a7..ce2b803a 100644
--- a/src/flextype/app/Foundation/Entries/Fields/IdField.php
+++ b/src/flextype/app/Foundation/Entries/Fields/IdField.php
@@ -9,6 +9,6 @@ declare(strict_types=1);
 
 if ($flextype->registry->get('flextype.settings.entries.fields.id.enabled')) {
     $flextype->emitter->addListener('onEntryAfterInitialized', function () use ($flextype) : void {
-        $flextype->entries->entry['id'] = isset($flextype->entries->entry['id']) ? (string) $flextype->entries->entry['id'] : (string) ltrim(rtrim($flextype->entries->entry_path, '/'), '/');
+        $flextype->entries->entry['id'] = isset($flextype->entries->entry['id']) ? (string) $flextype->entries->entry['id'] : (string) ltrim(rtrim($flextype->entries->entry_id, '/'), '/');
     });
 }
diff --git a/src/flextype/app/Foundation/Entries/Fields/ModifiedAtField.php b/src/flextype/app/Foundation/Entries/Fields/ModifiedAtField.php
index ff261d90..6419f2f6 100644
--- a/src/flextype/app/Foundation/Entries/Fields/ModifiedAtField.php
+++ b/src/flextype/app/Foundation/Entries/Fields/ModifiedAtField.php
@@ -11,6 +11,6 @@ use Flextype\Component\Filesystem\Filesystem;
 
 if ($flextype->registry->get('flextype.settings.entries.fields.modified_at.enabled')) {
     $flextype->emitter->addListener('onEntryAfterInitialized', function () use ($flextype) : void {
-        $flextype->entries->entry['modified_at'] = (int) Filesystem::getTimestamp($flextype->entries->getFileLocation($flextype->entries->entry_path));
+        $flextype->entries->entry['modified_at'] = (int) Filesystem::getTimestamp($flextype->entries->getFileLocation($flextype->entries->entry_id));
     });
 }
diff --git a/src/flextype/app/Foundation/Entries/Fields/PublishedAtField.php b/src/flextype/app/Foundation/Entries/Fields/PublishedAtField.php
index 80031fda..531c4f47 100644
--- a/src/flextype/app/Foundation/Entries/Fields/PublishedAtField.php
+++ b/src/flextype/app/Foundation/Entries/Fields/PublishedAtField.php
@@ -13,7 +13,7 @@ if ($flextype->registry->get('flextype.settings.entries.fields.published_at.enab
     $flextype->emitter->addListener('onEntryAfterInitialized', function () use ($flextype) : void {
         $flextype->entries->entry['published_at'] = isset($flextype->entries->entry['published_at']) ?
                                         (int) strtotime($flextype->entries->entry['published_at']) :
-                                        (int) Filesystem::getTimestamp($flextype->entries->getFileLocation($flextype->entries->entry_path));
+                                        (int) Filesystem::getTimestamp($flextype->entries->getFileLocation($flextype->entries->entry_id));
     });
 
     $flextype->emitter->addListener('onEntryCreate', function () use ($flextype) : void {
diff --git a/src/flextype/app/Foundation/Entries/Fields/SlugField.php b/src/flextype/app/Foundation/Entries/Fields/SlugField.php
index c10a09c0..3ef02d4d 100644
--- a/src/flextype/app/Foundation/Entries/Fields/SlugField.php
+++ b/src/flextype/app/Foundation/Entries/Fields/SlugField.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 if ($flextype->registry->get('flextype.settings.entries.fields.slug.enabled')) {
     $flextype->emitter->addListener('onEntryAfterInitialized', function () use ($flextype) : void {
-        $parts = explode('/', ltrim(rtrim($flextype->entries->entry_path, '/'), '/'));
+        $parts = explode('/', ltrim(rtrim($flextype->entries->entry_id, '/'), '/'));
         $flextype->entries->entry['slug'] = isset($flextype->entries->entry['slug']) ? (string) $flextype->entries->entry['slug'] : (string) end($parts);
     });
 }