// norm in Upgrader.php + reported 1.4 updates in 1.5 branch

This commit is contained in:
mMarinetti committed 2012-02-06 14:20:51 +00:00
1 parent ba689d2b6d
commit ea3317b2fb
1 file changed
+6
+6
View File
@@ -47,6 +47,7 @@ class UpgraderCore
public $autoupgrade; public $autoupgrade;
public $autoupgrade_module; public $autoupgrade_module;
public $autoupgrade_last_version; public $autoupgrade_last_version;
public $autoupgrade_module_link;
public $changelog; public $changelog;
public $md5; public $md5;
@@ -121,6 +122,7 @@ class UpgraderCore
$this->autoupgrade = (int)$feed->autoupgrade; $this->autoupgrade = (int)$feed->autoupgrade;
$this->autoupgrade_module = (int)$feed->autoupgrade_module; $this->autoupgrade_module = (int)$feed->autoupgrade_module;
$this->autoupgrade_last_version = (string)$feed->autoupgrade_last_version; $this->autoupgrade_last_version = (string)$feed->autoupgrade_last_version;
$this->autoupgrade_module_link = (string)$feed->autoupgrade_module_link;
$this->desc = (string)$feed->desc; $this->desc = (string)$feed->desc;
$config_last_version = array( $config_last_version = array(
'name' => $this->version_name, 'name' => $this->version_name,
@@ -130,6 +132,7 @@ class UpgraderCore
'autoupgrade' => $this->autoupgrade, 'autoupgrade' => $this->autoupgrade,
'autoupgrade_module' => $this->autoupgrade_module, 'autoupgrade_module' => $this->autoupgrade_module,
'autoupgrade_last_version' => $this->autoupgrade_last_version, 'autoupgrade_last_version' => $this->autoupgrade_last_version,
'autoupgrade_module_link' => $this->autoupgrade_module_link,
'changelog' => $this->changelog, 'changelog' => $this->changelog,
'desc' => $this->desc 'desc' => $this->desc
); );
@@ -176,6 +179,8 @@ class UpgraderCore
$this->autoupgrade_module = $last_version_check['autoupgrade_module']; $this->autoupgrade_module = $last_version_check['autoupgrade_module'];
if (isset($last_version_check['autoupgrade_last_version'])) if (isset($last_version_check['autoupgrade_last_version']))
$this->autoupgrade_last_version = $last_version_check['autoupgrade_last_version']; $this->autoupgrade_last_version = $last_version_check['autoupgrade_last_version'];
if (isset($last_version_check['autoupgrade_module_link']))
$this->autoupgrade_module_link = $last_version_check['autoupgrade_module_link'];
if (isset($last_version_check['md5'])) if (isset($last_version_check['md5']))
$this->md5 = $last_version_check['md5']; $this->md5 = $last_version_check['md5'];
if (isset($last_version_check['desc'])) if (isset($last_version_check['desc']))
@@ -195,6 +200,7 @@ class UpgraderCore
{ {
if (is_array($this->changed_files) && count($this->changed_files) == 0) if (is_array($this->changed_files) && count($this->changed_files) == 0)
{ {
libxml_set_streams_context(@stream_context_create(array('http' => array('timeout' => 3))));
$checksum = @simplexml_load_file($this->rss_md5file_link_dir._PS_VERSION_.'.xml'); $checksum = @simplexml_load_file($this->rss_md5file_link_dir._PS_VERSION_.'.xml');
if ($checksum == false) if ($checksum == false)
{ {