From 629ae720b61b20888154faddcb1412528e0b1e4f Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 23 Aug 2019 12:20:05 +0200
Subject: [PATCH] fix #2958 @0:10

---
 src/app/Magic/Fields/Model.php                    | 3 ++-
 src/app/Magic/Models/CubistMagicAbstractModel.php | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/Magic/Fields/Model.php b/src/app/Magic/Fields/Model.php
index 2560653..feec9cb 100644
--- a/src/app/Magic/Fields/Model.php
+++ b/src/app/Magic/Fields/Model.php
@@ -28,7 +28,8 @@ class Model extends Field
         $modelClass = $this->getAttribute('optionsmodel');
         $inst = new $modelClass();
 
-        return $modelClass::all()->pluck($this->getAttribute('attribute'), $inst->getPrimaryKey())->toArray();
+        $attr=$this->getAttribute('attribute');
+        return $modelClass::orderBy($attr)->get()->pluck($attr, $inst->getPrimaryKey())->toArray();
     }
 
     public function getDatabaseType()
diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 21ede78..88cddbe 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -152,7 +152,6 @@ class CubistMagicAbstractModel extends Model implements HasMedia
     // The slug is created automatically from the "title" field if no slug exists.
     public function getSlugOrTitleAttribute()
     {
-
         foreach ($this->_slugFields as $item) {
             if (isset($this->$item) && $this->item != '') {
                 return $this->$item;
-- 
2.39.5