Revert "Fix the usability of the image size fields (see #7565)."

This reverts commit a806ec0.
contao · Apr 27, 2015 · 9e580c2 · 9e580c2
1 parent 5d9c00e
commit 9e580c2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php
@@ -356,10 +356,6 @@
 	(
 		'proportional', 'box'
 	),
-	'image_sizes' => array
-	(
-		// placeholder
-	),
 	'exact' => array
 	(
 		'crop',

diff --git a/src/Resources/contao/dca/tl_content.php b/src/Resources/contao/dca/tl_content.php
@@ -248,7 +248,7 @@
 			'inputType'               => 'imageSize',
 			'options'                 => System::getImageSizes(),
 			'reference'               => &$GLOBALS['TL_LANG']['MSC'],
-			'eval'                    => array('rgxp'=>'natural', 'nospace'=>true, 'helpwizard'=>true, 'tl_class'=>'w50'),
+			'eval'                    => array('rgxp'=>'natural', 'includeBlankOption'=>true, 'nospace'=>true, 'helpwizard'=>true, 'tl_class'=>'w50'),
 			'sql'                     => "varchar(64) NOT NULL default ''"
 		),
 		'imagemargin' => array

diff --git a/src/Resources/contao/dca/tl_module.php b/src/Resources/contao/dca/tl_module.php
@@ -541,7 +541,7 @@
 			'inputType'               => 'imageSize',
 			'options'                 => System::getImageSizes(),
 			'reference'               => &$GLOBALS['TL_LANG']['MSC'],
-			'eval'                    => array('rgxp'=>'natural', 'nospace'=>true, 'helpwizard'=>true, 'tl_class'=>'w50'),
+			'eval'                    => array('rgxp'=>'natural', 'includeBlankOption'=>true, 'nospace'=>true, 'helpwizard'=>true, 'tl_class'=>'w50'),
 			'sql'                     => "varchar(64) NOT NULL default ''"
 		),
 		'useCaption' => array

diff --git a/src/Resources/contao/library/Contao/System.php b/src/Resources/contao/library/Contao/System.php
@@ -500,16 +500,21 @@ public static function getImageSizes()
 		{
 			try
 			{
+				$sizes = array();
 				$imageSize = \Database::getInstance()->query("SELECT id, name, width, height FROM tl_image_size ORDER BY pid, name");
 
 				while ($imageSize->next())
 				{
-					$GLOBALS['TL_CROP']['image_sizes'][$imageSize->id] = $imageSize->name . ' (' . $imageSize->width . 'x' . $imageSize->height . ')';
+					$sizes[$imageSize->id] = $imageSize->name;
+					$sizes[$imageSize->id] .= ' (' . $imageSize->width . 'x' . $imageSize->height . ')';
 				}
-			}
-			catch (\Exception $e) {}
 
-			static::$arrImageSizes = $GLOBALS['TL_CROP'];
+				static::$arrImageSizes = array_merge(array('image_sizes' => $sizes), $GLOBALS['TL_CROP']);
+			}
+			catch (\Exception $e)
+			{
+				static::$arrImageSizes = $GLOBALS['TL_CROP'];
+			}
 		}
 
 		return static::$arrImageSizes;