diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2015-07-01 02:31:59 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2015-07-01 02:31:59 +0000 |
| commit | 640e9246d3e1706e7f5ce77ccb586792b19398e0 (patch) | |
| tree | ac6fe921eed6a891ea562d4604929aec3e1708b9 /food_quantity.php | |
| parent | bbeffce07a41998d21c4805df2af0d88ef0cba04 (diff) | |
| parent | fe1bf80dfd9d270cfefc71284eb9d96b00283734 (diff) | |
Merge remote-tracking branch 'origin/dev'
Diffstat (limited to 'food_quantity.php')
| -rw-r--r-- | food_quantity.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/food_quantity.php b/food_quantity.php index b938745..e93c17e 100644 --- a/food_quantity.php +++ b/food_quantity.php @@ -25,13 +25,13 @@ if ( isset($_REQUEST['food']) ) { # get the selected food and quantities from the database $sql = sprintf (" - SELECT foodDescs.sciname, %s AS foodDesc, weights.* + SELECT foodDescs.sciname, CONCAT(foodDescs.long_desc, foodDescs.comname) + AS foodDesc, weights.* FROM foodDescs LEFT JOIN weights ON foodDescs.ndb_no = weights.ndb_no WHERE foodDescs.ndb_no = '%s' AND weights.usda_status = 'active' ", - $db->_dbConn->Concat("foodDescs.long_desc", "', '", "foodDescs.comname"), $food ); $db->Select($sql); |