// REVERT MERGE

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 13:35:06 +00:00
parent e159c925d8
commit be4811aa6e
182 changed files with 1335 additions and 6181 deletions
@@ -207,9 +207,10 @@ function createDir($path, $rights)

 function checkPSVersion()
 {
-	$upgrader = new Upgrader();
-
-	return $upgrader->checkPSVersion();
+	libxml_set_streams_context(stream_context_create(array('http' => array('timeout' => 3))));
+	if ($feed = @simplexml_load_file('http://www.prestashop.com/xml/version.xml') AND _PS_VERSION_ < $feed->version->num)
+		return array('name' => $feed->version->name, 'link' => $feed->download->link);
+	return false;
 }

 function translate($string)