Changeset 621


Ignore:
Timestamp:
Dec 4, 2013, 1:25:44 AM (11 years ago)
Author:
maron
Message:
  • Fixed: repair link in color names
Location:
trunk/includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/includes/Version.php

    r620 r621  
    66// and system will need database update.
    77
    8 $Revision = 620; // Subversion revision
     8$Revision = 621; // Subversion revision
    99$DatabaseRevision = 610; // Database structure revision
    1010$ReleaseTime = '2013-12-04';
  • trunk/includes/global.php

    r618 r621  
    563563      $where .= ')';
    564564    }
    565     if ($sqlall <> '') { $sqlall .= ' UNION ALL ( '.$sql.$where.$groupby.' )';}
    566     else {$sqlall .= ' ( '.$sql.$where.$groupby.' )'; }
    567   }
    568565      if ($SqlOK) {
    569         $DbResult = $System->Database->query($sqlall.'  ORDER BY LENGTH(Orig) DESC');
     566        $DbResult = $System->Database->query($sql.$where.$groupby.'  ORDER BY LENGTH(Orig) DESC');
    570567    //  echo ($sql.'|'.$where.'|'.$groupby);
    571568        while($Line = $DbResult->fetch_assoc())
     
    574571        }
    575572      }
     573
     574   // if ($sqlall <> '') { $sqlall .= ' UNION ALL ( '.$sql.$where.$groupby.' )';}
     575  //  else {$sqlall .= ' ( '.$sql.$where.$groupby.' )'; }
     576  }
    576577    return $buff;
    577578}
Note: See TracChangeset for help on using the changeset viewer.