merge master

miya0001 · miya0001 · commit 8cad05a557f4 · 2017-02-06T18:49:37.000+09:00
diff --git a/lib/functions.php b/lib/functions.php
@@ -36,7 +36,9 @@ public static function get_latest_vccw_url()
 		$api = "https://api.github.com/repos/vccw-team/vccw/releases/latest";
 		$body = json_decode( self::download( $api ) );
 
-		if ( $body ) {
+		if ( ! empty( $body->assets[0] ) && ! empty( $body->assets[0]->browser_download_url ) ) {
+			return $body->assets[0]->browser_download_url;
+		} elseif ( $body ) {
 			return $body->zipball_url;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,9 @@ public static function get_latest_vccw_url()`
`36`	`36`	`$api = "https://api.github.com/repos/vccw-team/vccw/releases/latest";`
`37`	`37`	`$body = json_decode( self::download( $api ) );`
`38`	`38`
`39`		`- if ( $body ) {`
	`39`	`+ if ( ! empty( $body->assets[0] ) && ! empty( $body->assets[0]->browser_download_url ) ) {`
	`40`	`+ return $body->assets[0]->browser_download_url;`
	`41`	`+ } elseif ( $body ) {`
`40`	`42`	`return $body->zipball_url;`
`41`	`43`	`}`
`42`	`44`	`}`