Changeset 615

Timestamp:

Nov 28, 2013, 7:49:39 PM (11 years ago)

Author:

maron

Message:

• Fixed: Some colored bug, Select as 1 query

Location:

trunk

Files:

• Modules/Translation/Form.php (modified) (1 diff)
• includes/Version.php (modified) (1 diff)
• includes/global.php (modified) (2 diffs)

trunk/Modules/Translation/Form.php

@@ -6 +6 @@
          $tran_replace = str_replace(' ',' ',$tran);
          $orig_replace = str_replace(' ',' ',$orig);
-                                  $Text = str_replace(' '.$orig,' <span Title="Přelož jako: '.$tran_replace.'" class="edit"><a class="edit" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Group.'&amp;ID='.$ID).'">'.$orig_replace.'</a></span>',$Text);
+                                  $Text = str_replace(' '.$orig,' <span Title="Přelož jako:&nbsp;'.$tran_replace.'" class="edit"><a class="edit" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Group.'&amp;ID='.$ID).'">'.$orig_replace.'</a></span>',$Text);
                                  return ($Text);
   }

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 614; // Subversion revision
+$Revision = 615; // Subversion revision
 $DatabaseRevision = 610; // Database structure revision 
 $ReleaseTime = '2013-11-27';

trunk/includes/global.php

@@ -538 +538 @@
     $Text = str_replace('>',' ',$Text);
     $ArrStr = explode(' ', $Text);
-      
+    $sqlall = '';  
   foreach($TablesColumn as $Table => $Column) 
   {  
-    $sql = 'SELECT `ID`,`'.$Column.'`, (SELECT `'.$Column.'` FROM `'.$Table.'` AS `T` WHERE '.
+    $sql = 'SELECT `ID`,`'.$Column.'` AS Orig, (SELECT `'.$Column.'` FROM `'.$Table.'` AS `T` WHERE '.
       '(`O`.`Entry` = `T`.`Entry`) AND (`Language` <> '.$Config['OriginalLanguage'].') LIMIT 1) AS `Tran` FROM `'.$Table.'` AS `O` WHERE ';
-    $groupby = ' GROUP BY `'.$Column.'`';
-  
+    $groupby = ' GROUP BY `'.$Column.'` ';
+                                       // ORDER BY LENGTH('.$Column.') DESC
 
     $where = '(`Language` = '.$Config['OriginalLanguage'].') ';
@@ -565 +565 @@
       $where = substr($where, 0, strlen($where) - 4);
       $where .= ')';
+    }
+    if ($sqlall <> '') { $sqlall .= ' UNION ALL ( '.$sql.$where.$groupby.' )';}
+    else {$sqlall .= ' ( '.$sql.$where.$groupby.' )'; }
+  }
       if ($SqlOK) {
-        $DbResult = $System->Database->query($sql.$where.$groupby);
+        $DbResult = $System->Database->query($sqlall.'  ORDER BY LENGTH(Orig) DESC');
     //  echo ($sql.'|'.$where.'|'.$groupby);
         while($Line = $DbResult->fetch_assoc()) 
         {
-          $buff[] = array($Line['ID'], GetIDbyName($Table), $Line[$Column], $Line['Tran']);
+          $buff[] = array($Line['ID'], GetIDbyName($Table), $Line['Orig'], $Line['Tran']);
         }
       }
-    }
-  }
     return $buff;
 }