// Merge with revision 7841

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-02 11:43:58 +00:00
parent c945049ef1
commit ffeb22bfb9
130 changed files with 6620 additions and 18585 deletions
+2 -2
View File
@@ -762,8 +762,8 @@ if ($lm->getIncludeTradFilename())
return '';
}
$context = stream_context_create(array('http' => array('method'=>"GET", 'timeout' => 3)));
$content = @file_get_contents('http://www.prestashop.com/partner/preactivation/partners.php?version=1.0', false, $context);
$stream_context = stream_context_create(array('http' => array('method'=>"GET", 'timeout' => 3)));
$content = @file_get_contents('http://www.prestashop.com/partner/preactivation/partners.php?version=1.0', false, $stream_context);
if ($content && $content[0] == '<')
{
$result = simplexml_load_string($content);