Skip to content

Commit 8a6b887

Browse files
authored
Merge pull request #182 from iMattPro/updates
Minor updates
2 parents 6fa3dad + b762b36 commit 8a6b887

File tree

3 files changed

+20
-19
lines changed

3 files changed

+20
-19
lines changed

.github/workflows/tests.yml

+17-17
Original file line numberDiff line numberDiff line change
@@ -93,24 +93,22 @@ jobs:
9393
strategy:
9494
matrix:
9595
include:
96-
- php: '7.1'
96+
- php: '7.2'
9797
db: "mariadb:10.1"
98-
- php: '7.1'
98+
- php: '7.2'
9999
db: "mariadb:10.2"
100-
- php: '7.1'
100+
- php: '7.2'
101101
db: "mariadb:10.3"
102-
- php: '7.1'
102+
- php: '7.2'
103103
db: "mariadb:10.4"
104-
- php: '7.1'
104+
- php: '7.2'
105105
db: "mariadb:10.5"
106-
- php: '7.1'
106+
- php: '7.2'
107107
db: "mysql:5.6"
108108
db_alias: "MyISAM Tests"
109109
MYISAM: 1
110-
- php: '7.1'
110+
- php: '7.2'
111111
db: "mysql:5.6"
112-
- php: '7.1'
113-
db: "mysql:5.7"
114112
- php: '7.2'
115113
db: "mysql:5.7"
116114
COVERAGE: 1
@@ -127,6 +125,8 @@ jobs:
127125
db: "mysql:5.7"
128126
- php: '8.2'
129127
db: "mysql:5.7"
128+
- php: '8.3'
129+
db: "mysql:5.7"
130130

131131
name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
132132

@@ -244,18 +244,16 @@ jobs:
244244
strategy:
245245
matrix:
246246
include:
247-
- php: '7.1'
247+
- php: '7.2'
248248
db: "postgres:9.5"
249-
- php: '7.1'
249+
- php: '7.2'
250250
db: "postgres:9.6"
251-
- php: '7.1'
251+
- php: '7.2'
252252
db: "postgres:10"
253-
- php: '7.1'
253+
- php: '7.2'
254254
db: "postgres:11"
255-
- php: '7.1'
255+
- php: '7.2'
256256
db: "postgres:12"
257-
- php: '7.1'
258-
db: "postgres:13"
259257
- php: '7.2'
260258
db: "postgres:13"
261259
- php: '7.3'
@@ -270,6 +268,8 @@ jobs:
270268
db: "postgres:14"
271269
- php: '8.2'
272270
db: "postgres:14"
271+
- php: '8.3'
272+
db: "postgres:14"
273273

274274
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
275275

@@ -358,7 +358,7 @@ jobs:
358358
strategy:
359359
matrix:
360360
include:
361-
- php: '7.1'
361+
- php: '7.2'
362362
db: "sqlite3"
363363
- php: '7.2'
364364
db: "mcr.microsoft.com/mssql/server:2017-latest"

composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
"version-check": {
3939
"host": "www.phpbb.com",
4040
"directory": "/customise/db/extension/ads",
41-
"filename": "version_check"
41+
"filename": "version_check",
42+
"ssl": true
4243
}
4344
}
4445
}

language/en/common.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
'AD_AFTER_FOOTER_NAVBAR' => 'After footer navbar',
6262
'AD_AFTER_FOOTER_NAVBAR_DESC' => 'Displays on every page after footer navigation bar.',
6363
'AD_POP_UP' => 'Pop-up',
64-
'AD_POP_UP_DESC' => 'Displays once per day when user visits this board as overlaying box. User need to close this box to continue to the content. Please, be aware, that this kind of advertisement is very obtrusive to the user!',
64+
'AD_POP_UP_DESC' => 'Displays once per day when user visits this board as overlaying box. User need to close this box to continue to the content. Please, be aware, that this kind of advertisement is very obtrusive to the user! This location does not support JavaScript code.',
6565
'AD_SLIDE_UP' => 'Slide up',
6666
'AD_SLIDE_UP_DESC' => 'Displays on every page after user scrolls below main content. Slides up from the bottom.',
6767
'AD_SCRIPTS' => 'Scripts',

0 commit comments

Comments
 (0)