Changeset 751

Timestamp:

Jan 13, 2014, 1:25:02 AM (11 years ago)

Author:

maron

Message:

• Fixed: Bad filtering not translated when all language is selected

Location:

trunk

Files:

• Modules/Translation/TranslationList.php (modified) (3 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Translation/TranslationList.php

@@ -100 +100 @@
                 }
                 $Output .= '</select></td>';
-                if($Filter['Language'] != 0) $LanguageFilter = ' AND (`T`.`Language` = '.$Filter['Language'].')';
-                else $LanguageFilter = '';
+                $LanguageFilter = '';
+                $LanguageFilterSub = '';
+                if($Filter['Language'] != 0) {
+      $LanguageFilter = ' AND (`T`.`Language` = '.$Filter['Language'].')';
+      $LanguageFilterSub = ' AND (`Sub`.`Language` = '.$Filter['Language'].')';
+    } 
         
                 // User
@@ -144 +148 @@
                 {
                     $WithoutAlter =       ' AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
-                                        '(`Sub`.`Language` <> '.$this->System->Config['OriginalLanguage'].')'.$LanguageFilter.
+                                        '(`Sub`.`Language` <> '.$this->System->Config['OriginalLanguage'].')'.$LanguageFilterSub.
                                         ' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`ID` != `T`.`ID`) AND (`Sub`.`Complete` = 1) AND '.
                                         '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`) LIMIT 1 ) ';
@@ -159 +163 @@
                         else if($Filter['State'] == 1) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].') '.
                                         'AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
-                                        '(`Sub`.`Language` = '.$Filter['Language'].')'.$UserFilter.
+                                        '(`Sub`.`Language` <> '.$this->System->Config['OriginalLanguage'].') '.$LanguageFilterSub.$UserFilter.
                                         ' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`Complete` = 1) AND '.
                                         '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`))';

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 749; // Subversion revision
+$Revision = 750; // Subversion revision
 $DatabaseRevision = 748; // Database structure revision 
 $ReleaseTime = '2014-01-12';