Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -26,6 +26,7 @@ phpMyAdmin - ChangeLog
 - bug       Undefined constant PMA_DRIZZLE
 - bug #4712 Wrongly positioned date-picker while Grid-Editing
 - bug #4714 Forced ORDER BY for own sql statements
+- bug #4721 Undefined property: stdClass::$version
 
 4.3.7.0 (2015-01-15)
 - bug #4694 js error on marking table as favorite in Safari (in private mode)

libraries/Util.class.php

@@ -4289,8 +4289,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')) {

version_check.php

@@ -16,13 +16,13 @@ header('Content-type: application/json; charset=UTF-8');
 
 $version = PMA_Util::getLatestVersion();
 
-if (empty($version_data)) {
+if (empty($version)) {
     echo json_encode(array());
 } else {
     echo json_encode(
         array(
-            'version' => $version->version,
-            'date' => $version->date,
+            'version' => (! empty($version->version) ? $version->version : ''),
+            'date' => (! empty($version->date) ? $version->date : ''),
         )
     );
 }