Changeset 621

Timestamp:

Dec 4, 2013, 1:25:44 AM (11 years ago)

Author:

maron

Message:

• Fixed: repair link in color names

Location:

trunk/includes

Files:

• Version.php (modified) (1 diff)
• global.php (modified) (2 diffs)

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 620; // Subversion revision
+$Revision = 621; // Subversion revision
 $DatabaseRevision = 610; // Database structure revision 
 $ReleaseTime = '2013-12-04';

trunk/includes/global.php

@@ -563 +563 @@
       $where .= ')';
     }
-    if ($sqlall <> '') { $sqlall .= ' UNION ALL ( '.$sql.$where.$groupby.' )';}
-    else {$sqlall .= ' ( '.$sql.$where.$groupby.' )'; }
-  }
       if ($SqlOK) {
-        $DbResult = $System->Database->query($sqlall.'  ORDER BY LENGTH(Orig) DESC');
+        $DbResult = $System->Database->query($sql.$where.$groupby.'  ORDER BY LENGTH(Orig) DESC');
     //  echo ($sql.'|'.$where.'|'.$groupby);
         while($Line = $DbResult->fetch_assoc()) 
@@ -574 +571 @@
         }
       }
+
+   // if ($sqlall <> '') { $sqlall .= ' UNION ALL ( '.$sql.$where.$groupby.' )';}
+  //  else {$sqlall .= ' ( '.$sql.$where.$groupby.' )'; }
+  }
     return $buff;
 }