Merge branch 'bug4721' into QA_4_3
This commit is contained in:
commit
190ea0452e
@ -4258,8 +4258,8 @@ class PMA_Util
|
||||
|
||||
$data = json_decode($response);
|
||||
if (is_object($data)
|
||||
&& /*overload*/mb_strlen($data->version)
|
||||
&& /*overload*/mb_strlen($data->date)
|
||||
&& ! empty($data->version)
|
||||
&& ! empty($data->date)
|
||||
&& $save
|
||||
) {
|
||||
if (! isset($_SESSION) && ! defined('TESTSUITE')) {
|
||||
|
||||
@ -18,8 +18,8 @@ $version = PMA_Util::getLatestVersion();
|
||||
|
||||
echo json_encode(
|
||||
array(
|
||||
'version' => $version->version,
|
||||
'date' => $version->date,
|
||||
'version' => (! empty($version->version) ? $version->version : ''),
|
||||
'date' => (! empty($version->date) ? $version->date : ''),
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user