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 /view_food.php | |
| parent | bbeffce07a41998d21c4805df2af0d88ef0cba04 (diff) | |
| parent | fe1bf80dfd9d270cfefc71284eb9d96b00283734 (diff) | |
Merge remote-tracking branch 'origin/dev'
Diffstat (limited to 'view_food.php')
| -rw-r--r-- | view_food.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/view_food.php b/view_food.php index b927459..956480f 100644 --- a/view_food.php +++ b/view_food.php @@ -91,7 +91,8 @@ if ( isLoggedIn() ) { if ( isset($_GET['showall']) ) { $smarty->assign("showAllNutrients", true); $sql = sprintf (" - SELECT foodDescs.long_desc, foodDescs.comname, %s AS foodDesc, foodDescs.sciname, + SELECT foodDescs.long_desc, foodDescs.comname, CONCAT(foodDescs.long_desc, + foodDescs.comname) AS foodDesc, foodDescs.sciname, weights.gm_wgt, weights.amount, weights.msre_desc, nutrientDefs.nutrdesc, nutrientDefs.units, nutrientData.nutr_no, nutrientData.nutr_val, dris.dri @@ -111,7 +112,6 @@ if ( isLoggedIn() ) { AND ((dris.gender = '%s') OR dris.id IS NULL) ORDER BY nutrientDefs.sr_order ", - $db->_dbConn->Concat("foodDescs.long_desc", "', '", "foodDescs.comname"), $_GET['food'], $_GET['food'], $_GET['weight'], @@ -121,7 +121,8 @@ if ( isLoggedIn() ) { ); } else { $sql = sprintf (" - SELECT foodDescs.long_desc, foodDescs.comname, %s AS foodDesc, foodDescs.sciname, + SELECT foodDescs.long_desc, foodDescs.comname, CONCAT(foodDescs.long_desc, + foodDescs.comname) AS foodDesc, foodDescs.sciname, weights.gm_wgt, weights.amount, weights.msre_desc, nutrientDefs.nutrdesc, nutrientDefs.units, nutrientData.nutr_no, nutrientData.nutr_val, dris.dri @@ -144,7 +145,6 @@ if ( isLoggedIn() ) { AND ((dris.gender = '%s') OR dris.id IS NULL) ORDER BY nutrientDefs.sr_order ", - $db->_dbConn->Concat("foodDescs.long_desc", "', '", "foodDescs.comname"), $_GET['food'], $_GET['food'], $_GET['weight'], @@ -166,7 +166,8 @@ if ( isLoggedIn() ) { if ( isset($_GET['showall']) ) { $smarty->assign("showAllNutrients", true); $sql = sprintf (" - SELECT foodDescs.long_desc, foodDescs.comname, %s AS foodDesc, foodDescs.sciname, + SELECT foodDescs.long_desc, foodDescs.comname, CONCAT(foodDescs.long_desc, + foodDescs.comname) AS foodDesc, foodDescs.sciname, weights.gm_wgt, weights.amount, weights.msre_desc, nutrientDefs.nutrdesc, nutrientDefs.units, nutrientData.nutr_no, nutrientData.nutr_val, dris.dri @@ -186,7 +187,6 @@ if ( isLoggedIn() ) { AND ((dris.gender = 'male') OR dris.id IS NULL) ORDER BY nutrientDefs.sr_order ", - $db->_dbConn->Concat("foodDescs.long_desc", "', '", "foodDescs.comname"), $_GET['food'], $_GET['food'], $_GET['weight'] @@ -194,7 +194,8 @@ if ( isLoggedIn() ) { } else { # show the user the default nutrients $sql = sprintf (" - SELECT foodDescs.long_desc, foodDescs.comname, %s AS foodDesc, foodDescs.sciname, + SELECT foodDescs.long_desc, foodDescs.comname, CONCAT(foodDescs.long_desc, + foodDescs.comname) AS foodDesc, foodDescs.sciname, weights.gm_wgt, weights.amount, weights.msre_desc, nutrientDefs.nutrdesc, nutrientDefs.units, nutrientData.nutr_no, nutrientData.nutr_val, dris.dri @@ -215,7 +216,6 @@ if ( isLoggedIn() ) { AND ((dris.gender = 'male') OR dris.id IS NULL) ORDER BY nutrientDefs.sr_order ", - $db->_dbConn->Concat("foodDescs.long_desc", "', '", "foodDescs.comname"), $_GET['food'], $_GET['food'], $_GET['weight'] |