fix version compare

zhangpeng96 · Jan 29, 2022 · 00c75d2 · 00c75d2
1 parent 1eedc48
commit 00c75d2
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/var/Widget/Ajax.php b/var/Widget/Ajax.php
@@ -54,20 +54,17 @@ public function checkVersion()
                 $json = json_decode($response, true);
 
                 if (!empty($json)) {
-                    [$soft, $version] = explode(' ', $this->options->generator);
-                    $current = explode('/', $version);
+                    $version = $this->options->version;
 
                     if (
-                        isset($json['release']) && isset($json['version'])
+                        isset($json['release'])
                         && preg_match("/^[0-9\.]+$/", $json['release'])
-                        && preg_match("/^[0-9\.]+$/", $json['version'])
-                        && version_compare($json['release'], $current[0], '>=')
-                        && version_compare($json['version'], $current[1], '>')
+                        && version_compare($json['release'], $version, '>=')
                     ) {
                         $result = [
                             'available' => 1,
-                            'latest'    => $json['release'] . '-' . $json['version'],
-                            'current'   => $current[0] . '-' . $current[1],
+                            'latest'    => $json['release'],
+                            'current'   => $version,
                             'link'      => 'http://typecho.org/download'
                         ];
                     }