Index: branches/5.2.x/core/units/images/images_config.php =================================================================== diff -u -r13840 -r14092 --- branches/5.2.x/core/units/images/images_config.php (.../images_config.php) (revision 13840) +++ branches/5.2.x/core/units/images/images_config.php (.../images_config.php) (revision 14092) @@ -1,6 +1,6 @@ true, 'AutoClone' => true, - 'FilterMenu' => Array( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array('show_active','show_disabled'), 'type' => WHERE_FILTER), - ), - 'Filters' => Array( - 'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Enabled != 1' ), - 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Enabled != 0' ), - ) - ), - 'CalculatedFields' => Array( - '' => Array( - 'Preview' => '0', - ), - ), + '' => Array ( + 'Preview' => '0', + ), + ), 'ListSQLs' => Array( ''=>'SELECT * FROM %s', ), // key - special, value - list select sql 'ItemSQLs' => Array( ''=>'SELECT * FROM %s', ), 'ListSortings' => Array( - '' => Array( - 'ForcedSorting' => Array('Priority' => 'desc'), - 'Sorting' => Array('Name' => 'asc'), - ) - ), + '' => Array( + 'ForcedSorting' => Array('Priority' => 'desc'), + 'Sorting' => Array('Name' => 'asc'), + ) + ), + 'Fields' => Array ( 'ImageId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'ResourceId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), @@ -135,7 +126,7 @@ 'Enabled' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Enabled', 0 => 'la_Disabled',), - 'default' => 0, 'not_null' => 1, 'use_phrases' => 1, + 'default' => 1, 'not_null' => 1, 'use_phrases' => 1, ), 'DefaultImg' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', @@ -146,8 +137,8 @@ 'Priority' => Array('type' => 'int', 'default' => 0, 'not_null'=>1), 'ThumbPath' => Array( 'type' => 'string', 'formatter' => 'kPictureFormatter', - 'skip_empty' => 1, 'max_len' => 240, 'default' => '', - 'not_null' => 1, 'include_path' => 1, + 'skip_empty' => 1, 'max_len' => 240, 'default' => NULL, + 'include_path' => 1, 'allowed_types' => Array( 'image/jpeg', 'image/pjpeg', 'image/png', 'image/x-png', 'image/gif', 'image/bmp' @@ -167,8 +158,8 @@ ), 'VirtualFields' => Array( - 'Preview' => Array(), - 'ImageUrl' => Array(), + 'Preview' => Array ('type' => 'string', 'default' => ''), + 'ImageUrl' => Array ('type' => 'string', 'default' => ''), ), 'Grids' => Array(