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 /nutrient_search.php | |
| parent | bbeffce07a41998d21c4805df2af0d88ef0cba04 (diff) | |
| parent | fe1bf80dfd9d270cfefc71284eb9d96b00283734 (diff) | |
Merge remote-tracking branch 'origin/dev'
Diffstat (limited to 'nutrient_search.php')
| -rw-r--r-- | nutrient_search.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nutrient_search.php b/nutrient_search.php index 21531b4..64ddb2d 100644 --- a/nutrient_search.php +++ b/nutrient_search.php @@ -38,7 +38,8 @@ $smarty->assign("count", $_GET['count']); # execute query $sql = sprintf (" - SELECT foodDescs.ndb_no, foodDescs.long_desc, foodDescs.comname, %s AS foodDesc, + SELECT foodDescs.ndb_no, foodDescs.long_desc, foodDescs.comname, + CONCAT(foodDescs.long_desc, foodDescs.comname) AS foodDesc, nutrientData.nutr_val, nutrientDefs.nutrdesc, nutrientDefs.units FROM foodDescs LEFT JOIN nutrientData ON foodDescs.ndb_no = nutrientData.ndb_no @@ -47,7 +48,6 @@ $sql = sprintf (" WHERE nutrientDefs.nutr_no = '%s' ORDER BY nutrientData.nutr_val DESC ", - $db->_dbConn->Concat("foodDescs.long_desc", "', '", "foodDescs.comname"), $_GET['nutrient'] ); |