Merge branch 'pull'

This commit is contained in:
Friendika 2011-08-14 04:27:34 -07:00
commit 1b8adf0f12

View file

@ -62,7 +62,6 @@ class StatusNetOAuth extends TwitterOAuth {
$this->http_info = array(); $this->http_info = array();
$ci = curl_init(); $ci = curl_init();
/* Curl settings */ /* Curl settings */
$prx = 'http://localhost:8118';
$prx = get_config('system','proxy'); $prx = get_config('system','proxy');
logger('Proxy SN: '.$prx); logger('Proxy SN: '.$prx);
if(strlen($prx)) { if(strlen($prx)) {