Merge branch 'development' into staging

FluidTYPO3 · Mar 19, 2015 · 2984d1d · 2984d1d
2 parents a9e265f + 28ad531
commit 2984d1d
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 295 deletions.
diff --git a/Classes/Backend/ContentSelector.php b/Classes/Backend/ContentSelector.php
@@ -92,8 +92,8 @@ protected function wrapSelector($selector, $name, $selectedIcon) {
 	protected function renderOptionGroup(array $configuration, $groupLabel, $value) {
 		foreach ($configuration as $form) {
 			/** @var Form $form */
-			$selected = ($optionValue === $value ? ' selected="selected"' : '');
 			$optionValue = $form->getOption('contentElementId');
+			$selected = ($optionValue === $value ? ' selected="selected"' : '');
 			$label = $form->getLabel();
 			$icon = MiscellaneousUtility::getIconForTemplate($form);
 			$label = (0 === strpos($label, 'LLL:') ? $GLOBALS['LANG']->sL($label) : $label);

diff --git a/composer.json b/composer.json
@@ -27,8 +27,26 @@
     },
     "repositories": [
         {
-            "type": "vcs",
-            "url": "https://github.com/TYPO3/TYPO3.CMS"
+            "type": "package",
+            "package": {
+                "name": "typo3/cms",
+                "version": "6.2.10",
+                "dist": {
+                    "url": "https://github.com/TYPO3/TYPO3.CMS/archive/6.2.10.zip",
+                    "type": "zip"
+                }
+            }
+        },
+        {
+            "type": "package",
+            "package": {
+                "name": "typo3/cms",
+                "version": "7.1.0",
+                "dist": {
+                    "url": "https://github.com/TYPO3/TYPO3.CMS/archive/7.1.0.zip",
+                    "type": "zip"
+                }
+            }
         }
     ]
 }