Index: branches/unlabeled/unlabeled-1.62.2/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r5653 -r5655
--- branches/unlabeled/unlabeled-1.62.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 5653)
+++ branches/unlabeled/unlabeled-1.62.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 5655)
@@ -90,9 +90,7 @@
$filters = Array();
$prefix_special = $this->getPrefixSpecial();
-
-
foreach ($filter_menu['Filters'] as $filter_key => $filter_params) {
$group_params = isset($filter_params['group_id']) ? $filter_menu['Groups'][ $filter_params['group_id'] ] : Array();
if (!isset($group_params['element_type'])) {
Index: branches/unlabeled/unlabeled-1.96.2/admin/install/langpacks/english.lang
===================================================================
diff -u -r5642 -r5655
--- branches/unlabeled/unlabeled-1.96.2/admin/install/langpacks/english.lang (.../english.lang) (revision 5642)
+++ branches/unlabeled/unlabeled-1.96.2/admin/install/langpacks/english.lang (.../english.lang) (revision 5655)
@@ -526,6 +526,8 @@
QWRtaW5pc3RyYXRpb24=
UGVybWlzc2lvbiBUeXBlIEZyb250IEVuZA==
RnJvbnQgRW5k
+ Tm90IFRyYW5zbGF0ZWQ=
+ VHJhbnNsYXRlZA==
QWRtaW4=
Qm90aA==
RnJvbnQ=
Index: branches/unlabeled/unlabeled-1.8.2/core/units/phrases/phrases_config.php
===================================================================
diff -u -r5653 -r5655
--- branches/unlabeled/unlabeled-1.8.2/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 5653)
+++ branches/unlabeled/unlabeled-1.8.2/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 5655)
@@ -58,12 +58,12 @@
Array('mode' => 'AND', 'filters' => Array('translated', 'not_translated'), 'type' => WHERE_FILTER),
),
'Filters' => Array(
- 'show_front' => Array('label' =>'la_PhraseType_Front', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 0', 'group_id' => 0),
- 'show_admin' => Array('label' => 'la_PhraseType_Admin', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 1', 'group_id' => 0),
- 'show_both' => Array('label' => 'la_PhraseType_Both', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 2', 'group_id' => 0),
+ 'show_front' => Array('label' =>'la_PhraseType_Front', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 0'),
+ 'show_admin' => Array('label' => 'la_PhraseType_Admin', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 1'),
+ 'show_both' => Array('label' => 'la_PhraseType_Both', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 2'),
's1' => Array(),
- 'translated' => Array('label' => 'la_PhraseTranslated', 'on_sql' => '', 'off_sql' => '%1$s.Translation <> pri.Translation', 'group_id' => 1),
- 'not_translated' => Array('label' => 'la_PhraseNotTranslated', 'on_sql' => '', 'off_sql' => '%1$s.Translation = pri.Translation', 'group_id' => 1),
+ 'translated' => Array('label' => 'la_PhraseTranslated', 'on_sql' => '', 'off_sql' => '%1$s.Translation = pri.Translation'),
+ 'not_translated' => Array('label' => 'la_PhraseNotTranslated', 'on_sql' => '', 'off_sql' => '%1$s.Translation != pri.Translation'),
)
),
Index: branches/unlabeled/unlabeled-1.8.2/kernel/units/phrases/phrases_config.php
===================================================================
diff -u -r5653 -r5655
--- branches/unlabeled/unlabeled-1.8.2/kernel/units/phrases/phrases_config.php (.../phrases_config.php) (revision 5653)
+++ branches/unlabeled/unlabeled-1.8.2/kernel/units/phrases/phrases_config.php (.../phrases_config.php) (revision 5655)
@@ -58,12 +58,12 @@
Array('mode' => 'AND', 'filters' => Array('translated', 'not_translated'), 'type' => WHERE_FILTER),
),
'Filters' => Array(
- 'show_front' => Array('label' =>'la_PhraseType_Front', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 0', 'group_id' => 0),
- 'show_admin' => Array('label' => 'la_PhraseType_Admin', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 1', 'group_id' => 0),
- 'show_both' => Array('label' => 'la_PhraseType_Both', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 2', 'group_id' => 0),
+ 'show_front' => Array('label' =>'la_PhraseType_Front', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 0'),
+ 'show_admin' => Array('label' => 'la_PhraseType_Admin', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 1'),
+ 'show_both' => Array('label' => 'la_PhraseType_Both', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 2'),
's1' => Array(),
- 'translated' => Array('label' => 'la_PhraseTranslated', 'on_sql' => '', 'off_sql' => '%1$s.Translation <> pri.Translation', 'group_id' => 1),
- 'not_translated' => Array('label' => 'la_PhraseNotTranslated', 'on_sql' => '', 'off_sql' => '%1$s.Translation = pri.Translation', 'group_id' => 1),
+ 'translated' => Array('label' => 'la_PhraseTranslated', 'on_sql' => '', 'off_sql' => '%1$s.Translation = pri.Translation'),
+ 'not_translated' => Array('label' => 'la_PhraseNotTranslated', 'on_sql' => '', 'off_sql' => '%1$s.Translation != pri.Translation'),
)
),