// Merge -> revision 8720

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8722 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-22 15:45:10 +00:00
parent 69db63f26c
commit 4f2a090e24
87 changed files with 1591 additions and 724 deletions
+1 -1
View File
@@ -684,7 +684,7 @@ class Socolissimo extends CarrierModule
{
if (Configuration::get('SOCOLISSIMO_SUP'))
{
$ctx = stream_context_create(array('http' => array('timeout' => 1)));
$ctx = @stream_context_create(array('http' => array('timeout' => 1)));
$return = @file_get_contents(Configuration::get('SOCOLISSIMO_SUP_URL'), 0, $ctx);
if(ini_get('allow_url_fopen') == 0)