forked from science-ation/science-ation
- Merge the last 2 commits into the users makeover branch
This commit is contained in:
parent
46178ca051
commit
6c32f2c2d7
@ -186,6 +186,7 @@
|
||||
curl_setopt ($ch, CURLOPT_POSTFIELDSIZE, 0);
|
||||
curl_setopt ($ch, CURLOPT_TIMEOUT, 360);
|
||||
curl_setopt ($ch, CURLOPT_SSLVERSION, 3);
|
||||
curl_setopt ($ch, CURLOPT_SSL_VERIFYPEER, false);
|
||||
$datastream = curl_exec ($ch); /// execute the curl session and return the output to a variable $datastream
|
||||
$datastream = str_replace(" standalone=\"yes\"","",$datastream);
|
||||
// echo "curl close <br />";
|
||||
@ -238,6 +239,7 @@
|
||||
award_awards
|
||||
JOIN award_sources ON award_awards.award_sources_id=award_sources.id
|
||||
WHERE award_sources.enabled='yes'
|
||||
AND award_awards.year={$config['FAIRYEAR']}
|
||||
ORDER BY award_sources.name, award_awards.name");
|
||||
echo mysql_error();
|
||||
echo "<table class=\"tableview\">";
|
||||
|
@ -147,6 +147,7 @@ include "xml.inc.php";
|
||||
curl_setopt ($ch, CURLOPT_POSTFIELDSIZE, 0);
|
||||
curl_setopt ($ch, CURLOPT_TIMEOUT, 360);
|
||||
curl_setopt ($ch, CURLOPT_SSLVERSION, 3);
|
||||
curl_setopt ($ch, CURLOPT_SSL_VERIFYPEER, false);
|
||||
$datastream = curl_exec ($ch); /// execute the curl session and return the output to a variable $datastream
|
||||
$datastream = str_replace(" standalone=\"yes\"","",$datastream);
|
||||
// echo "curl close <br />";
|
||||
|
Loading…
Reference in New Issue
Block a user