fix #2958 @0:10

diff --git a/src/app/Magic/Fields/Model.php b/src/app/Magic/Fields/Model.php
index 2560653f2c08927101bbd38a0db9863dc964a9eb..feec9cb75c1d9d39dabbd812cb017776f9487e05 100644 (file)
--- 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 21ede78b9977eb8cbc40648a49990ee17e68f071..88cddbe9c74608e00bb9e13d2e12198dc9f8d5eb 100644 (file)
--- 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;