Merge tag '2.0.3'

Hotfix release

- Hotfix bottle neck #1153 ToolboxFile.php
- Hotfix bottle neck 2 #1153 MetaModels.php

Author: stefanheimes

src/MetaModels/Helper/ToolboxFile.php

@@ -699,6 +699,10 @@ private function checkDownloads()
      */
     public static function convertValueToPath($varValue)
     {
+        if (empty($varValue)) {
+            return '';
+        }
+
         $objFiles = FilesModel::findByPk($varValue);
 
         if ($objFiles !== null) {

src/MetaModels/MetaModel.php

@@ -21,6 +21,7 @@
  * @author     Chris Raidler <c.raidler@rad-consulting.ch>
  * @author     David Molineus <david.molineus@netzmacht.de>
  * @author     Sven Baumann <baumann.sv@gmail.com>
+ * @author     Ingolf Steinhardt <info@e-spin.de>
  * @copyright  2012-2018 The MetaModels team.
  * @license    https://github.com/MetaModels/core/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
@@ -76,6 +77,13 @@ class MetaModel implements IMetaModel
      */
     protected $serviceContainer;
 
+    /**
+     * The cache existing ids.
+     *
+     * @var array
+     */
+    private $existingIds = [];
+
     /**
      * Instantiate a MetaModel.
      *
@@ -722,6 +730,11 @@ public function getIdsFromFilter($objFilter, $strSortBy = '', $intOffset = 0, $i
             } elseif ('id' === $strSortBy) {
                 asort($arrFilteredIds);
             } elseif (in_array($strSortBy, array('pid', 'tstamp', 'sorting'))) {
+                // Check existing ids.
+                if (array_intersect($arrFilteredIds, $this->existingIds) == $arrFilteredIds) {
+                    return $arrFilteredIds;
+                }
+                
                 // Sort by database values.
                 $arrFilteredIds = $this
                     ->getDatabase()
@@ -736,6 +749,8 @@ public function getIdsFromFilter($objFilter, $strSortBy = '', $intOffset = 0, $i
                     )
                     ->execute($arrFilteredIds)
                     ->fetchEach('id');
+
+                $this->existingIds = array_merge($this->existingIds, $arrFilteredIds);
             } elseif ($strSortBy == 'random') {
                 shuffle($arrFilteredIds);
             }