Skip to content

Commit 7015165

Browse files
afragenafragen
committed
Merge branch 'develop'
2 parents 52c97e5 + ebc29f4 commit 7015165

8 files changed

+54
-47
lines changed

‎.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ notifications:
88
on_failure: change
99

1010
php:
11-
- 5.6
12-
- 7.0
13-
- 7.1
14-
- 7.2
1511
- 7.3
12+
- 7.2
13+
- 7.1
14+
- 7.0
15+
- 5.6
1616

1717
env:
1818
- WP_VERSION=latest WP_MULTISITE=0

‎CHANGES.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#### [unreleased]
22

3+
#### 8.6.2 / 2019-01-14
4+
* fix for bug with Bitbucket endpoints, fixes [#757](https://github.com/afragen/github-updater/issues/757)
5+
36
#### 8.6.1 / 2019-01-11
47
* remove `tmp-readme.txt` after parsing, fixes [#754](https://github.com/afragen/github-updater/issues/754)
58
* directly call `wp_cron()` after refreshing cache

‎github-updater.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Plugin Name: GitHub Updater
1313
* Plugin URI: https://github.com/afragen/github-updater
1414
* Description: A plugin to automatically update GitHub, Bitbucket, GitLab, or Gitea hosted plugins, themes, and language packs. It also allows for remote installation of plugins or themes into WordPress.
15-
* Version: 8.6.1
15+
* Version: 8.6.2
1616
* Author: Andy Fragen
1717
* License: GNU General Public License v2
1818
* License URI: http://www.gnu.org/licenses/gpl-2.0.html

‎languages/github-updater.pot

+38-38
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# This file is distributed under the same license as the GitHub Updater plugin.
33
msgid ""
44
msgstr ""
5-
"Project-Id-Version: GitHub Updater 8.6.1\n"
5+
"Project-Id-Version: GitHub Updater 8.6.2\n"
66
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/github-updater\n"
77
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
88
"Language-Team: LANGUAGE <[email protected]>\n"
99
"MIME-Version: 1.0\n"
1010
"Content-Type: text/plain; charset=UTF-8\n"
1111
"Content-Transfer-Encoding: 8bit\n"
12-
"POT-Creation-Date: 2019-01-11T17:52:58+00:00\n"
12+
"POT-Creation-Date: 2019-01-15T03:44:46+00:00\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"X-Generator: WP-CLI 2.1.0\n"
1515
"X-Domain: github-updater\n"
@@ -237,49 +237,49 @@ msgstr ""
237237
msgid "Use of Remote Management services may result increase some page load speeds only for `admin` level users in the dashboard."
238238
msgstr ""
239239

240-
#: src/GitHub_Updater/API/Bitbucket_API.php:351
240+
#: src/GitHub_Updater/API/Bitbucket_API.php:353
241241
msgid "Bitbucket Private Settings"
242242
msgstr ""
243243

244-
#: src/GitHub_Updater/API/Bitbucket_API.php:358
245-
#: src/GitHub_Updater/API/Bitbucket_API.php:446
244+
#: src/GitHub_Updater/API/Bitbucket_API.php:360
245+
#: src/GitHub_Updater/API/Bitbucket_API.php:448
246246
msgid "Bitbucket Username"
247247
msgstr ""
248248

249-
#: src/GitHub_Updater/API/Bitbucket_API.php:367
250-
#: src/GitHub_Updater/API/Bitbucket_API.php:454
249+
#: src/GitHub_Updater/API/Bitbucket_API.php:369
250+
#: src/GitHub_Updater/API/Bitbucket_API.php:456
251251
msgid "Bitbucket Password"
252252
msgstr ""
253253

254-
#: src/GitHub_Updater/API/Bitbucket_API.php:383
254+
#: src/GitHub_Updater/API/Bitbucket_API.php:385
255255
msgid "Bitbucket Private Repositories"
256256
msgstr ""
257257

258-
#: src/GitHub_Updater/API/Bitbucket_API.php:413
258+
#: src/GitHub_Updater/API/Bitbucket_API.php:415
259259
msgid "Bitbucket"
260260
msgstr ""
261261

262-
#: src/GitHub_Updater/API/Bitbucket_API.php:422
262+
#: src/GitHub_Updater/API/Bitbucket_API.php:424
263263
msgid "Check box if private repository. Leave unchecked for public repositories."
264264
msgstr ""
265265

266-
#: src/GitHub_Updater/API/Bitbucket_API.php:429
266+
#: src/GitHub_Updater/API/Bitbucket_API.php:431
267267
msgid "Enter your personal Bitbucket username and password."
268268
msgstr ""
269269

270-
#: src/GitHub_Updater/API/Bitbucket_API.php:463
270+
#: src/GitHub_Updater/API/Bitbucket_API.php:465
271271
msgid "Private Bitbucket Repository"
272272
msgstr ""
273273

274-
#: src/GitHub_Updater/API/Bitbucket_API.php:479
274+
#: src/GitHub_Updater/API/Bitbucket_API.php:481
275275
msgid "Check for private Bitbucket repositories."
276276
msgstr ""
277277

278-
#: src/GitHub_Updater/API/Bitbucket_API.php:494
278+
#: src/GitHub_Updater/API/Bitbucket_API.php:496
279279
msgid "Enter Bitbucket username."
280280
msgstr ""
281281

282-
#: src/GitHub_Updater/API/Bitbucket_API.php:509
282+
#: src/GitHub_Updater/API/Bitbucket_API.php:511
283283
msgid "Enter Bitbucket password."
284284
msgstr ""
285285

@@ -291,33 +291,33 @@ msgstr ""
291291
msgid "Enter plugin or theme slug."
292292
msgstr ""
293293

294-
#: src/GitHub_Updater/API/Gitea_API.php:310
295-
#: src/GitHub_Updater/API/Gitea_API.php:328
296-
#: src/GitHub_Updater/API/Gitea_API.php:390
294+
#: src/GitHub_Updater/API/Gitea_API.php:312
295+
#: src/GitHub_Updater/API/Gitea_API.php:330
296+
#: src/GitHub_Updater/API/Gitea_API.php:392
297297
msgid "Gitea Access Token"
298298
msgstr ""
299299

300-
#: src/GitHub_Updater/API/Gitea_API.php:319
300+
#: src/GitHub_Updater/API/Gitea_API.php:321
301301
msgid "Gitea Private Settings"
302302
msgstr ""
303303

304-
#: src/GitHub_Updater/API/Gitea_API.php:363
304+
#: src/GitHub_Updater/API/Gitea_API.php:365
305305
msgid "Gitea"
306306
msgstr ""
307307

308-
#: src/GitHub_Updater/API/Gitea_API.php:372
308+
#: src/GitHub_Updater/API/Gitea_API.php:374
309309
msgid "Enter your repository specific Gitea Access Token."
310310
msgstr ""
311311

312-
#: src/GitHub_Updater/API/Gitea_API.php:379
312+
#: src/GitHub_Updater/API/Gitea_API.php:381
313313
msgid "Enter your Gitea Access Token."
314314
msgstr ""
315315

316-
#: src/GitHub_Updater/API/Gitea_API.php:406
316+
#: src/GitHub_Updater/API/Gitea_API.php:408
317317
msgid "Enter Gitea Access Token for private Gitea repositories."
318318
msgstr ""
319319

320-
#: src/GitHub_Updater/API/Gitea_API.php:437
320+
#: src/GitHub_Updater/API/Gitea_API.php:439
321321
msgid "You must set a Gitea Access Token."
322322
msgstr ""
323323

@@ -361,59 +361,59 @@ msgstr ""
361361
msgid "You must set a GitLab.com, GitLab CE, or GitLab Enterprise Access Token."
362362
msgstr ""
363363

364-
#: src/GitHub_Updater/API/GitHub_API.php:339
364+
#: src/GitHub_Updater/API/GitHub_API.php:340
365365
msgid "GitHub Personal Access Token"
366366
msgstr ""
367367

368-
#: src/GitHub_Updater/API/GitHub_API.php:346
368+
#: src/GitHub_Updater/API/GitHub_API.php:347
369369
msgid "github.com Access Token"
370370
msgstr ""
371371

372-
#: src/GitHub_Updater/API/GitHub_API.php:359
372+
#: src/GitHub_Updater/API/GitHub_API.php:360
373373
msgid "GitHub Enterprise Access Token"
374374
msgstr ""
375375

376-
#: src/GitHub_Updater/API/GitHub_API.php:376
376+
#: src/GitHub_Updater/API/GitHub_API.php:377
377377
msgid "GitHub Private Settings"
378378
msgstr ""
379379

380-
#: src/GitHub_Updater/API/GitHub_API.php:403
380+
#: src/GitHub_Updater/API/GitHub_API.php:404
381381
msgid "Enter your GitHub Access Token. Leave empty for public repositories."
382382
msgstr ""
383383

384-
#: src/GitHub_Updater/API/GitHub_API.php:410
384+
#: src/GitHub_Updater/API/GitHub_API.php:411
385385
msgid "Enter your personal github.com or GitHub Enterprise Access Token to avoid API access limits."
386386
msgstr ""
387387

388-
#: src/GitHub_Updater/API/GitHub_API.php:421
388+
#: src/GitHub_Updater/API/GitHub_API.php:422
389389
msgid "GitHub Access Token"
390390
msgstr ""
391391

392-
#: src/GitHub_Updater/API/GitHub_API.php:435
392+
#: src/GitHub_Updater/API/GitHub_API.php:436
393393
msgid "GitHub"
394394
msgstr ""
395395

396-
#: src/GitHub_Updater/API/GitHub_API.php:449
396+
#: src/GitHub_Updater/API/GitHub_API.php:450
397397
msgid "Enter GitHub Access Token for private GitHub repositories."
398398
msgstr ""
399399

400-
#: src/GitHub_Updater/API/Bitbucket_Server_API.php:345
400+
#: src/GitHub_Updater/API/Bitbucket_Server_API.php:344
401401
msgid "Bitbucket Server Private Settings"
402402
msgstr ""
403403

404-
#: src/GitHub_Updater/API/Bitbucket_Server_API.php:352
404+
#: src/GitHub_Updater/API/Bitbucket_Server_API.php:351
405405
msgid "Bitbucket Server Username"
406406
msgstr ""
407407

408-
#: src/GitHub_Updater/API/Bitbucket_Server_API.php:361
408+
#: src/GitHub_Updater/API/Bitbucket_Server_API.php:360
409409
msgid "Bitbucket Server Password"
410410
msgstr ""
411411

412-
#: src/GitHub_Updater/API/Bitbucket_Server_API.php:377
412+
#: src/GitHub_Updater/API/Bitbucket_Server_API.php:376
413413
msgid "Bitbucket Server Private Repositories"
414414
msgstr ""
415415

416-
#: src/GitHub_Updater/API/Bitbucket_Server_API.php:407
416+
#: src/GitHub_Updater/API/Bitbucket_Server_API.php:406
417417
msgid "Bitbucket Server"
418418
msgstr ""
419419

‎src/GitHub_Updater/API/Bitbucket_API.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ public function get_release_asset() {
169169
* @return string $endpoint
170170
*/
171171
public function construct_download_link( $branch_switch = false ) {
172+
self::$method = 'download_link';
172173
$download_link_base = $this->get_api_url( '/:owner/:repo/get/', true );
173174
$endpoint = '';
174175

@@ -225,10 +226,11 @@ public function add_endpoints( $git, $endpoint ) {
225226
case 'meta':
226227
case 'changes':
227228
case 'translation':
229+
case 'release_asset':
230+
case 'download_link':
228231
break;
229232
case 'tags':
230233
case 'branches':
231-
case 'release_asset':
232234
$endpoint = add_query_arg(
233235
[
234236
'pagelen' => '100',

‎src/GitHub_Updater/API/Bitbucket_Server_API.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,9 @@ public function get_remote_readme() {
175175
* @return string $endpoint
176176
*/
177177
public function construct_download_link( $branch_switch = false ) {
178+
self::$method = 'download_link';
178179
$download_link_base = $this->get_api_url( '/rest/archive/1.0/projects/:owner/repos/:repo/archive', true );
179-
180-
self::$method = 'download_link';
181-
$endpoint = $this->add_endpoints( $this, '' );
180+
$endpoint = $this->add_endpoints( $this, '' );
182181

183182
if ( $branch_switch ) {
184183
$endpoint = urldecode( add_query_arg( 'at', $branch_switch, $endpoint ) );

‎src/GitHub_Updater/API/GitHub_API.php

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public function get_release_asset() {
127127
* @return string $endpoint
128128
*/
129129
public function construct_download_link( $branch_switch = false ) {
130+
self::$method = 'download_link';
130131
$download_link_base = $this->get_api_url( '/repos/:owner/:repo/zipball/', true );
131132
$endpoint = '';
132133

‎src/GitHub_Updater/API/Gitea_API.php

+2
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ public function get_release_asset() {
151151
* @return string $endpoint
152152
*/
153153
public function construct_download_link( $branch_switch = false ) {
154+
self::$method = 'download_link';
154155
$download_link_base = $this->get_api_url( '/repos/:owner/:repo/archive/', true );
155156
$endpoint = '';
156157

@@ -190,6 +191,7 @@ public function add_endpoints( $git, $endpoint ) {
190191
case 'tags':
191192
case 'changes':
192193
case 'translation':
194+
case 'download_link':
193195
break;
194196
case 'branches':
195197
$endpoint = add_query_arg( 'per_page', '100', $endpoint );

0 commit comments

Comments
 (0)