Index: branches/5.1.x/admin_templates/articles/articles_images.tpl =================================================================== diff -u -N -r13096 -r13940 --- branches/5.1.x/admin_templates/articles/articles_images.tpl (.../articles_images.tpl) (revision 13096) +++ branches/5.1.x/admin_templates/articles/articles_images.tpl (.../articles_images.tpl) (revision 13940) @@ -99,7 +99,7 @@ - + Index: branches/5.1.x/admin_templates/articles/articles_relations.tpl =================================================================== diff -u -N -r13096 -r13940 --- branches/5.1.x/admin_templates/articles/articles_relations.tpl (.../articles_relations.tpl) (revision 13096) +++ branches/5.1.x/admin_templates/articles/articles_relations.tpl (.../articles_relations.tpl) (revision 13940) @@ -92,7 +92,7 @@ - + Index: branches/5.1.x/admin_templates/articles/articles_files.tpl =================================================================== diff -u -N -r13096 -r13940 --- branches/5.1.x/admin_templates/articles/articles_files.tpl (.../articles_files.tpl) (revision 13096) +++ branches/5.1.x/admin_templates/articles/articles_files.tpl (.../articles_files.tpl) (revision 13940) @@ -78,7 +78,7 @@ - + Index: branches/5.1.x/admin_templates/articles/articles_reviews.tpl =================================================================== diff -u -N -r13096 -r13940 --- branches/5.1.x/admin_templates/articles/articles_reviews.tpl (.../articles_reviews.tpl) (revision 13096) +++ branches/5.1.x/admin_templates/articles/articles_reviews.tpl (.../articles_reviews.tpl) (revision 13940) @@ -106,7 +106,7 @@ - + Index: branches/5.1.x/units/articles/articles_config.php =================================================================== diff -u -N -r13747 -r13940 --- branches/5.1.x/units/articles/articles_config.php (.../articles_config.php) (revision 13747) +++ branches/5.1.x/units/articles/articles_config.php (.../articles_config.php) (revision 13940) @@ -1,6 +1,6 @@ Array ( - 'Groups' => Array ( - Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_pending', 'show_disabled'), 'type' => WHERE_FILTER), - Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER), - Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER), - Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER), - Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER), - ), - 'Filters' => Array ( - 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), - 'show_pending' => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ), - 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), - 's1' => Array (), - 'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ), - 'show_hot' => Array ('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1' ), - 'show_pop' => Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1' ), - 'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1' ), - ) - ), + 'Groups' => Array ( + Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER), + ), + 'Filters' => Array ( + 'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ), + 'show_hot' => Array ('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1' ), + 'show_pop' => Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1' ), + 'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1' ), + ), + ), 'CatalogSelectorName' => 'newslist',