Merge branch 'release/1.1.6'

in2code-de · Jan 16, 2017 · 95b9d05 · 95b9d05
2 parents 6165d90 + b8d41cb
commit 95b9d05
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Classes/Utility/TcaUtility.php b/Classes/Utility/TcaUtility.php
@@ -260,6 +260,7 @@ public static function getFullTcaForSelectSideBySide(
                 'config' => [
                     'type' => 'select',
                     'foreign_table' => $table,
+                    'MM' => $mmTable,
                     'foreign_table_where' => 'AND sys_language_uid in (-1, 0)',
                     'size' => 5,
                     'autoSizeMax' => 30,

diff --git a/Classes/ViewHelpers/RenderContentElementsViewHelper.php b/Classes/ViewHelpers/RenderContentElementsViewHelper.php
@@ -68,8 +68,13 @@ public function injectConfigurationManager(ConfigurationManagerInterface $config
 
     public function findTtContentUidsByMmTable($domainObjectUid, $table)
     {
-        $uidArray = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('uid_foreign as uid', $table,
-            'uid_local=' . (int)$domainObjectUid);
+        $uidArray = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+            'uid_foreign as uid',
+            $table,
+            'uid_local=' . (int)$domainObjectUid,
+            '',
+            'sorting, sorting_foreign'
+        );
 
         return $uidArray;
     }

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -21,7 +21,7 @@
     'uploadfolder' => '0',
     'createDirs' => '',
     'clearCacheOnLoad' => 0,
-    'version' => '1.1.5',
+    'version' => '1.1.6',
     'constraints' => array(
         'depends' => array(
             'typo3' => '6.2.0-7.6.99',