Index: branches/5.0.x/core/units/themes/themes_config.php =================================================================== diff -u -N -r13270 -r13385 --- branches/5.0.x/core/units/themes/themes_config.php (.../themes_config.php) (revision 13270) +++ branches/5.0.x/core/units/themes/themes_config.php (.../themes_config.php) (revision 13385) @@ -1,6 +1,6 @@ true, 'AutoClone' => true, - 'ListSQLs' => Array ('' => ' SELECT %1$s.* %2$s - FROM %s - LEFT JOIN '.TABLE_PREFIX.'Stylesheets st ON st.StylesheetId = %1$s.StylesheetId'), + 'ListSQLs' => Array ('' => 'SELECT %1$s.* %2$s FROM %s'), - 'ItemSQLs' => Array ( '' => ' SELECT %1$s.* %2$s - FROM %s - LEFT JOIN '.TABLE_PREFIX.'Stylesheets st ON st.StylesheetId = %1$s.StylesheetId'), - 'ListSortings' => Array ( '' => Array( 'Sorting' => Array('Name' => 'asc'), ) ), - 'CalculatedFields' => Array ( - '' => Array ( - 'StyleName' => 'st.Name', - 'LastCompiled' => 'st.LastCompiled', - ), - ), - 'Fields' => Array( 'ThemeId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Name' => Array('type' => 'string','not_null' => 1, 'required' => 1, 'default' => ''), 'Enabled' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Disabled', 1 => 'la_Enabled'), - 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, ), 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), 'PrimaryTheme' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, - ), + ), 'CacheTimeout' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'StylesheetId' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Stylesheets', 'option_key_field' => 'StylesheetId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0), + 'StylesheetId' => Array('type' => 'int', /*'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Stylesheets', 'option_key_field' => 'StylesheetId', 'option_title_field' => 'Name',*/ 'not_null' => 1, 'default' => 0), 'LanguagePackInstalled' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', @@ -154,11 +141,6 @@ 'TemplateAliases' => Array ('type' => 'string', 'formatter' => 'kSerializedFormatter', 'default' => 'a:0:{}'), ), - 'VirtualFields' => Array ( - 'StyleName' => Array ('type' => 'string', 'default' => ''), - 'LastCompiled' => Array ('type' => 'int', 'default' => null), - ), - 'Grids' => Array( 'Default' => Array( 'Icons' => Array (