Merge remote-tracking branch 'Seldaek/patch-1'

This commit is contained in:
Thaddee Tyl 2015-06-22 23:26:29 +02:00
commit 0a93aafaaf

View File

@ -1036,6 +1036,10 @@ cache(function(data, match, sendBadge, request) {
var format = match[3]; var format = match[3];
var apiUrl = 'https://packagist.org/packages/' + userRepo + '.json'; var apiUrl = 'https://packagist.org/packages/' + userRepo + '.json';
var badgeData = getBadgeData('downloads', data); var badgeData = getBadgeData('downloads', data);
if (userRepo.substr(-14) === '/:package_name') {
badgeData.text[1] = 'invalid';
return sendBadge(format, badgeData);
}
request(apiUrl, function(err, res, buffer) { request(apiUrl, function(err, res, buffer) {
if (err != null) { if (err != null) {
badgeData.text[1] = 'inaccessible'; badgeData.text[1] = 'inaccessible';
@ -1074,6 +1078,10 @@ cache(function(data, match, sendBadge, request) {
var format = match[3]; var format = match[3];
var apiUrl = 'https://packagist.org/packages/' + userRepo + '.json'; var apiUrl = 'https://packagist.org/packages/' + userRepo + '.json';
var badgeData = getBadgeData('packagist', data); var badgeData = getBadgeData('packagist', data);
if (userRepo.substr(-14) === '/:package_name') {
badgeData.text[1] = 'invalid';
return sendBadge(format, badgeData);
}
request(apiUrl, function(err, res, buffer) { request(apiUrl, function(err, res, buffer) {
if (err != null) { if (err != null) {
badgeData.text[1] = 'inaccessible'; badgeData.text[1] = 'inaccessible';
@ -1152,6 +1160,10 @@ cache(function(data, match, sendBadge, request) {
var format = match[2]; var format = match[2];
var apiUrl = 'https://packagist.org/packages/' + userRepo + '.json'; var apiUrl = 'https://packagist.org/packages/' + userRepo + '.json';
var badgeData = getBadgeData('license', data); var badgeData = getBadgeData('license', data);
if (userRepo.substr(-14) === '/:package_name') {
badgeData.text[1] = 'invalid';
return sendBadge(format, badgeData);
}
request(apiUrl, function(err, res, buffer) { request(apiUrl, function(err, res, buffer) {
if (err != null) { if (err != null) {
badgeData.text[1] = 'inaccessible'; badgeData.text[1] = 'inaccessible';