makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12536] Use stable values when unstable are unavailable

Browse source 
PHPBB3-12536
This commit is contained in:
Tristan Darricau 2014-05-15 01:14:44 +02:00
parent 8b6df0e2f8
commit e1d9f1c67c
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/phpbb/version_helper.php
View file

@ -215,19 +215,10 @@ class version_helper
if ($this->force_stability !== null) if ($this->force_stability !== null)
{ {
$stability = ($this->force_stability === 'unstable') ? 'unstable' : 'stable'; return ($this->force_stability === 'unstable') ? $info['unstable'] : $info['stable'];
}
else
{
$stability = $this->is_stable($this->current_version) ? 'stable' : 'unstable';
} }
if (!isset($info[$stability])) return ($this->is_stable($this->current_version)) ? $info['stable'] : $info['unstable'];
{
return array();
}
return $info[$stability];
} }
/** /**
@ -271,6 +262,9 @@ class version_helper
} }
} }
$info['stable'] = (empty($info['stable'])) ? array() : $info['stable'];
$info['unstable'] = (empty($info['unstable'])) ? $info['stable'] : $info['unstable'];
$this->cache->put($cache_file, $info, 86400); // 24 hours $this->cache->put($cache_file, $info, 86400); // 24 hours
} }