Changeset 879 for trunk/includes

Timestamp:

Apr 7, 2020, 9:53:00 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Wrong Setup tables initialization.
• Fixed: Export SQL query compatible with newer SQL server.

File:

• trunk/includes/Global.php (modified) (2 diffs)

trunk/includes/Global.php

@@ -588 +588 @@
 
     $where = '(`Language` = '.$Config['OriginalLanguage'].') ';
-    if ($mode == 1) $where .= ' AND EXISTS(SELECT 1 FROM `'.$Table.
+    if ($mode == 1) 
+    {
+      $where .= ' AND EXISTS(SELECT 1 FROM `'.$Table.
       '` AS `Sub` WHERE (`Sub`.`Language` <> '.$Config['OriginalLanguage'].
       ') AND (`Sub`.`Entry` = `O`.`Entry`))';
-    if ($mode == 2) $where .= ' AND NOT EXISTS(SELECT 1 FROM `'.$Table.
+    }
+    if ($mode == 2) 
+    {
+      $where .= ' AND NOT EXISTS(SELECT 1 FROM `'.$Table.
       '` AS `Sub` WHERE (`Sub`.`Language` <> '.$Config['OriginalLanguage'].
       ') AND (`Sub`.`Entry` = `O`.`Entry`))';
+    }
     $where .= ' AND (';
-    if (array_search('the', $ArrStr)) $where .= '(`O`.`'.$Column.'` LIKE "The %") OR ';
+    if (array_search('the', $ArrStr)) 
+    {
+      $where .= '(`O`.`'.$Column.'` LIKE "The %") OR ';
+    }
 
     $SqlOK = false;
@@ -618 +627 @@
         //$sql.$where.$groupby.$orderby
 //          $buff[] = array($Line['ID'], GetIDbyName($Table), $Line['Orig'], $Line['Tran']);
-      if ($sqlall <> '') { $sqlall .= ' UNION ALL ( '.$sql.$where.$groupby.' )';}
-        else {$sqlall .= ' ( '.$sql.$where.$groupby.' )'; }
+      if ($sqlall <> '') 
+      { 
+        $sqlall .= ' UNION ALL ( '.$sql.$where.$groupby.' )';      
+      } else {
+        $sqlall .= ' ( '.$sql.$where.$groupby.' )';             
+      }
     }
   }