diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e0b00ba1..f7785a7a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -93,23 +93,23 @@ jobs: strategy: matrix: include: - - php: '7.1' + - php: '7.2' db: "mariadb:10.1" - - php: '7.1' + - php: '7.2' db: "mariadb:10.2" - - php: '7.1' + - php: '7.2' db: "mariadb:10.3" - - php: '7.1' + - php: '7.2' db: "mariadb:10.4" - - php: '7.1' + - php: '7.2' db: "mariadb:10.5" - - php: '7.1' + - php: '7.2' db: "mysql:5.6" db_alias: "MyISAM Tests" MYISAM: 1 - - php: '7.1' + - php: '7.2' db: "mysql:5.6" - - php: '7.1' + - php: '7.2' db: "mysql:5.7" - php: '7.2' db: "mysql:5.7" @@ -244,18 +244,16 @@ jobs: strategy: matrix: include: - - php: '7.1' + - php: '7.2' db: "postgres:9.5" - - php: '7.1' + - php: '7.2' db: "postgres:9.6" - - php: '7.1' + - php: '7.2' db: "postgres:10" - - php: '7.1' + - php: '7.2' db: "postgres:11" - - php: '7.1' + - php: '7.2' db: "postgres:12" - - php: '7.1' - db: "postgres:13" - php: '7.2' db: "postgres:13" - php: '7.3' diff --git a/language/en/common.php b/language/en/common.php index 71167ef4..7ede2932 100644 --- a/language/en/common.php +++ b/language/en/common.php @@ -84,9 +84,9 @@ 'STATUS' => 'Status', 'TICKET' => 'Ticket', - 'TICKET_ERROR' => 'Ticket ID must be of the format “PHPBB3-#####”.', + 'TICKET_ERROR' => 'Ticket ID must be of the format “PHPBB-#####” or “PHPBB3-#####”.', 'TICKET_ERROR_DUP' => 'You must click on an idea title from the live search results. To delete the duplicate, clear the field and press ENTER. To exit this field press ESC.', - 'TOP' => 'Top', + 'TOP' => 'Top', 'TOP_IDEAS' => 'Top Ideas', 'TOTAL_IDEAS' => [ 1 => '%d idea', diff --git a/styles/prosilver/template/idea_body.html b/styles/prosilver/template/idea_body.html index 7c2f3a2b..8cee761d 100644 --- a/styles/prosilver/template/idea_body.html +++ b/styles/prosilver/template/idea_body.html @@ -53,10 +53,10 @@

{{ lang('STATUS') }}

{% if IDEA_TICKET or S_CAN_EDIT %}
{{ lang('TICKET') ~ lang('COLON') }} - + {% if S_CAN_EDIT %} {% if IDEA_TICKET %}{{ lang('EDIT') }}{% else %}{{ lang('ADD') }}{% endif %} - + {% endif %}
{% endif %} diff --git a/styles/prosilver/template/ideas.js b/styles/prosilver/template/ideas.js index a517ea69..a07cbe1f 100644 --- a/styles/prosilver/template/ideas.js +++ b/styles/prosilver/template/ideas.js @@ -224,13 +224,13 @@ value = $this.val(), info; - if (value && !(info = /^PHPBB3-(\d{1,6})$/.exec(value))) { + if (value && !(info = /^PHPBB3?-(\d{1,6})$/.exec(value))) { phpbb.alert($this.attr('data-l-err'), $this.attr('data-l-msg')); return; } if (value) { - value = 'PHPBB3-' + info[1]; + value = 'PHPBB-' + info[1]; } showLoadingIndicator();