1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-23 22:41:33 +02:00

Compare commits

...

41 Commits

Author SHA1 Message Date
Marc Alexander
a85536d9aa [prep-release-3.2.3] Update changelog for 3.2.3-RC2 2018-07-30 21:32:27 +02:00
Marc Alexander
75c082e605 [prep-release-3.2.3] Add migration for 3.2.3-RC2 2018-07-30 21:29:19 +02:00
Marc Alexander
7fbfd7300e [prep-release-3.2.3] Update version numbers for 3.2.3-RC2 2018-07-30 21:27:09 +02:00
Marc Alexander
81b02587cd Merge remote-tracking branch 'senky/ticket/11847' into prep-release-3.2.3 2018-07-30 13:56:33 +02:00
Marc Alexander
0e4a38956a Merge remote-tracking branch 'rubencm/ticket/15731' into prep-release-3.2.3 2018-07-30 13:44:48 +02:00
Jakub Senko
8276b3d337 [ticket/11847] Add depends_on() to auth_provider_oauth
PHPBB3-11847
2018-07-30 11:37:37 +02:00
Rubén Calvo
a6a3899aea [ticket/15731] Fix language string parameters
PHPBB3-15731
2018-07-30 11:20:42 +02:00
Marc Alexander
c72d443738 Merge pull request #5232 from marc1706/ticket/15677
[ticket/15677] Update symfony  to 2.8.42, others to latest
2018-07-18 21:54:12 +02:00
Tristan Darricau
c4cef8c427 Merge pull request #5238 from avijc/ticket/15680
[ticket/15680] Point to 3.2 documentation

* github.com:/phpbb/phpbb:
  [ticket/15680] Point to 3.2 documentation
2018-07-08 18:50:28 +02:00
Marc Alexander
a3f7bc2e51 [ticket/15677] Updates for Symfony 2.8.42
PHPBB3-15677
2018-07-08 17:53:05 +02:00
Marc Alexander
bf81228d37 [ticket/15677] Update symfony to 2.8.41, others to latest
PHPBB3-15677
2018-07-08 17:49:19 +02:00
Tristan Darricau
43d7f15a25 Merge pull request #5231 from marc1706/ticket/15676
[ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY

* github.com:/phpbb/phpbb:
  [ticket/15676] Use paragraphs and classes as suggested by hanakin
  [ticket/15676] Use twig syntax
  [ticket/15676] Simplify link text and use privacy link in cookie notice
  [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY
2018-07-08 17:38:27 +02:00
Marc Alexander
0925a22062 Merge pull request #5233 from rxu/ticket/15678
[ticket/15678] Fix PHP warning in filesystem.php
2018-06-20 22:08:37 +02:00
Marc Alexander
2f3bd918ac [ticket/15676] Use paragraphs and classes as suggested by hanakin
PHPBB3-15676
2018-06-20 21:50:49 +02:00
Marc Alexander
ecf19b13c8 Merge pull request #5218 from senky/ticket/15657
[ticket/15657] Add MCP queue events
2018-06-17 15:38:08 +02:00
Marc Alexander
aea56fcf57 Merge pull request #5246 from marc1706/ticket/15633
[ticket/15633] Double space to single space
2018-06-17 15:35:17 +02:00
scootergrisen
90e4eb2451 [ticket/15633] Double space to single space
Value of GROUP_MAX_RECIPIENTS_EXPLAIN key contains
double space. This removes one of the spaces.

PHPBB3-15633
2018-06-17 14:10:22 +02:00
Marc Alexander
ec87cc1f3e Merge pull request #5190 from Crizz0/ticket/15627
[ticket/15627] Reword the YES_ACCURATE_PM_BUTTON incl explaination
2018-06-17 13:27:06 +02:00
Marc Alexander
ff171f3a3b Merge pull request #5158 from kasimi/ticket/15586
[ticket/15586] Fixed adding module the automatic way without specifying modes
2018-06-17 11:35:08 +02:00
Marc Alexander
57cb513b8b Merge pull request #5191 from Crizz0/ticket/15630
[ticket/15630] ACP_COOKIE_SETTINGS_EXPLAIN change <b> to <strong>
2018-06-12 22:34:25 +02:00
Marc Alexander
6369637fbf Merge pull request #5192 from Crizz0/ticket/15629
[ticket/15629] Add info to RECAPTCHA_LANG and change to en-GB
2018-06-12 22:22:47 +02:00
Marc Alexander
32eb2f427c Merge pull request #5226 from rubencm/ticket/15504
[ticket/15504] Fix warning message
2018-06-12 22:06:55 +02:00
Anssi Johansson
5f243ad665 [ticket/15680] Point to 3.2 documentation
The old link pointed to 3.1 documentation

PHPBB3-15680
2018-06-05 21:29:47 +03:00
rxu
bd91b6be87 [ticket/15678] Fix PHP warning in filesystem.php
PHPBB3-15678
2018-06-01 22:51:53 +07:00
rxu
645ceb1bfe [ticket/15548] Fix dead link in ACP_COOKIE_SETTINGS_EXPLAIN language entry
PHPBB3-15548
2018-06-01 14:50:07 +02:00
Marc Alexander
7284bf5883 [ticket/15676] Use twig syntax
PHPBB3-15676
2018-05-31 22:26:17 +02:00
Marc Alexander
25a46ef4b3 [ticket/15676] Simplify link text and use privacy link in cookie notice
PHPBB3-15676
2018-05-31 22:15:36 +02:00
Marc Alexander
b5a79d9a9d Merge branch 'prep-release-3.2.3' into 3.2.x 2018-05-31 19:51:55 +02:00
Marc Alexander
680361e865 Merge pull request #5182 from marc1706/ticket/15604
[ticket/15604] Use HTTPS links for download SQL server drivers
2018-05-31 19:51:16 +02:00
Marc Alexander
c6a35237a2 [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY
PHPBB3-15676
2018-05-31 09:31:33 +02:00
Rubén Calvo
cc4a68f32a [ticket/15504] Fix warning message
PHPBB3-15504
2018-05-25 00:34:31 +02:00
Jakub Senko
04574c75a3 [ticket/15657] Add MCP queue events
PHPBB3-15657
2018-05-03 09:23:57 +02:00
Christian Schnegelberger
4bb57f9814 [ticket/15629] Add info to RECAPTCHA_LANG and change to en-GB
PHPBB3-15629
2018-04-14 11:44:12 +02:00
Christian Schnegelberger
ab8d328702 [ticket/15630] ACP_COOKIE_SETTINGS_EXPLAIN change <b> to <strong>
PHPBB3-15630
2018-04-14 11:41:02 +02:00
Christian Schnegelberger
71f2801d78 [ticket/15627] Reword the YES_ACCURATE_PM_BUTTON incl explaination
PHPBB3-15627
2018-04-11 19:24:46 +02:00
Derky
7c839470b7 Merge pull request #5182 from marc1706/ticket/15604
[ticket/15604] Use HTTPS links for download SQL server drivers
2018-03-30 21:03:27 +02:00
Marc Alexander
d8c9dd8802 [ticket/15604] Use HTTPS links & curl for SQL server driver download
PHPBB3-15604
2018-03-29 20:38:00 +02:00
Marc Alexander
22a251916c [3.2.x] Update version numbers to 3.2.4-dev 2018-03-26 21:18:16 +02:00
Marc Alexander
b98a81364f Merge branch 'prep-release-3.2.3' into 3.2.x 2018-03-26 21:17:02 +02:00
kasimi
aa9d24ad31 [ticket/15586] Added tests for adding modules the automatic way
PHPBB3-15586
2018-03-11 22:17:26 +01:00
kasimi
2d5fe90ed5 [ticket/15586] Fixed adding module the automatic way without specifying modes
PHPBB3-15586
2018-03-11 15:28:49 +01:00
30 changed files with 575 additions and 174 deletions

View File

@@ -64,9 +64,9 @@ before_test:
if ($env:db -eq "mssql") {
cd c:\tools\php\ext
$DLLVersion = "4.1.6.1"
appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/sqlsrv/$($:DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip
curl -o php_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip https://windows.php.net/downloads/pecl/releases/sqlsrv/$($:DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip
7z x -y php_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip > $null
appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip
curl -o php_pdo_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip https://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip
7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip > $null
Remove-Item c:\tools\php\* -include .zip
cd c:\tools\php

View File

@@ -2,9 +2,9 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build -->
<property name="newversion" value="3.2.3-RC1" />
<property name="prevversion" value="3.2.2" />
<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.0, 3.2.1" />
<property name="newversion" value="3.2.3-RC2" />
<property name="prevversion" value="3.2.3-RC1" />
<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.0, 3.2.1, 3.2.2" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />

331
phpBB/composer.lock generated
View File

@@ -280,16 +280,16 @@
},
{
"name": "lusitanian/oauth",
"version": "v0.8.10",
"version": "v0.8.11",
"source": {
"type": "git",
"url": "https://github.com/Lusitanian/PHPoAuthLib.git",
"reference": "09f4af38f17db6938253f4d1b171d537913ac1ed"
"reference": "fc11a53db4b66da555a6a11fce294f574a8374f9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/09f4af38f17db6938253f4d1b171d537913ac1ed",
"reference": "09f4af38f17db6938253f4d1b171d537913ac1ed",
"url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/fc11a53db4b66da555a6a11fce294f574a8374f9",
"reference": "fc11a53db4b66da555a6a11fce294f574a8374f9",
"shasum": ""
},
"require": {
@@ -343,7 +343,7 @@
"oauth",
"security"
],
"time": "2016-07-12 22:15:00"
"time": "2018-02-14 22:37:14"
},
{
"name": "marc1706/fast-image-size",
@@ -462,16 +462,16 @@
},
{
"name": "paragonie/random_compat",
"version": "v1.4.2",
"version": "v1.4.3",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
"reference": "965cdeb01fdcab7653253aa81d40441d261f1e66"
"reference": "9b3899e3c3ddde89016f576edb8c489708ad64cd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/965cdeb01fdcab7653253aa81d40441d261f1e66",
"reference": "965cdeb01fdcab7653253aa81d40441d261f1e66",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/9b3899e3c3ddde89016f576edb8c489708ad64cd",
"reference": "9b3899e3c3ddde89016f576edb8c489708ad64cd",
"shasum": ""
},
"require": {
@@ -506,7 +506,7 @@
"pseudorandom",
"random"
],
"time": "2017-03-13 16:22:52"
"time": "2018-04-04 21:48:54"
},
{
"name": "patchwork/utf8",
@@ -616,16 +616,16 @@
},
{
"name": "react/promise",
"version": "v2.5.1",
"version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/promise.git",
"reference": "62785ae604c8d69725d693eb370e1d67e94c4053"
"reference": "f4edc2581617431aea50430749db55cc3fc031b3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/reactphp/promise/zipball/62785ae604c8d69725d693eb370e1d67e94c4053",
"reference": "62785ae604c8d69725d693eb370e1d67e94c4053",
"url": "https://api.github.com/repos/reactphp/promise/zipball/f4edc2581617431aea50430749db55cc3fc031b3",
"reference": "f4edc2581617431aea50430749db55cc3fc031b3",
"shasum": ""
},
"require": {
@@ -658,7 +658,7 @@
"promise",
"promises"
],
"time": "2017-03-25 12:08:31"
"time": "2018-06-13 15:59:06"
},
{
"name": "s9e/text-formatter",
@@ -727,21 +727,22 @@
},
{
"name": "symfony/config",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
"reference": "17605ff58313d9fe94e507620a399721fc347b6d"
"reference": "93bdf96d0e3c9b29740bf9050e7a996b443c8436"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/17605ff58313d9fe94e507620a399721fc347b6d",
"reference": "17605ff58313d9fe94e507620a399721fc347b6d",
"url": "https://api.github.com/repos/symfony/config/zipball/93bdf96d0e3c9b29740bf9050e7a996b443c8436",
"reference": "93bdf96d0e3c9b29740bf9050e7a996b443c8436",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"symfony/filesystem": "~2.3|~3.0.0"
"symfony/filesystem": "~2.3|~3.0.0",
"symfony/polyfill-ctype": "~1.8"
},
"require-dev": {
"symfony/yaml": "~2.7|~3.0.0"
@@ -779,20 +780,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
"time": "2018-01-21 19:03:25"
"time": "2018-05-01 22:52:40"
},
{
"name": "symfony/console",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "162ca7d0ea597599967aa63b23418e747da0896b"
"reference": "e8e59b74ad1274714dad2748349b55e3e6e630c7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/162ca7d0ea597599967aa63b23418e747da0896b",
"reference": "162ca7d0ea597599967aa63b23418e747da0896b",
"url": "https://api.github.com/repos/symfony/console/zipball/e8e59b74ad1274714dad2748349b55e3e6e630c7",
"reference": "e8e59b74ad1274714dad2748349b55e3e6e630c7",
"shasum": ""
},
"require": {
@@ -806,7 +807,7 @@
"symfony/process": "~2.1|~3.0.0"
},
"suggest": {
"psr/log": "For using the console logger",
"psr/log-implementation": "For using the console logger",
"symfony/event-dispatcher": "",
"symfony/process": ""
},
@@ -840,20 +841,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2018-01-29 08:54:45"
"time": "2018-05-15 21:17:45"
},
{
"name": "symfony/debug",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "35e36287fc0fdc8a08f70efcd4865ae6d8a6ee55"
"reference": "a26ddce7fe4e884097d72435653bc7e703411f26"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/35e36287fc0fdc8a08f70efcd4865ae6d8a6ee55",
"reference": "35e36287fc0fdc8a08f70efcd4865ae6d8a6ee55",
"url": "https://api.github.com/repos/symfony/debug/zipball/a26ddce7fe4e884097d72435653bc7e703411f26",
"reference": "a26ddce7fe4e884097d72435653bc7e703411f26",
"shasum": ""
},
"require": {
@@ -897,20 +898,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2018-01-18 22:12:33"
"time": "2018-06-22 15:01:26"
},
{
"name": "symfony/dependency-injection",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
"reference": "91ad61e6f140b050eba4aa39bc52eece713f2a71"
"reference": "0f42a0827d99a867ffd279ae083e7daf1fe42cb7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/91ad61e6f140b050eba4aa39bc52eece713f2a71",
"reference": "91ad61e6f140b050eba4aa39bc52eece713f2a71",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/0f42a0827d99a867ffd279ae083e7daf1fe42cb7",
"reference": "0f42a0827d99a867ffd279ae083e7daf1fe42cb7",
"shasum": ""
},
"require": {
@@ -960,20 +961,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
"time": "2018-01-29 08:55:23"
"time": "2018-05-25 13:50:34"
},
{
"name": "symfony/event-dispatcher",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc"
"reference": "9b69aad7d4c086dc94ebade2d5eb9145da5dac8c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d64be24fc1eba62f9daace8a8918f797fc8e87cc",
"reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9b69aad7d4c086dc94ebade2d5eb9145da5dac8c",
"reference": "9b69aad7d4c086dc94ebade2d5eb9145da5dac8c",
"shasum": ""
},
"require": {
@@ -1020,24 +1021,25 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2018-01-03 07:36:31"
"time": "2018-04-06 07:35:03"
},
{
"name": "symfony/filesystem",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "1f4e8351e0196562f5e8ec584baeceeb8e2e92f6"
"reference": "0f685c099aca7ba86bcc31850186dbfe84a4a8a1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/1f4e8351e0196562f5e8ec584baeceeb8e2e92f6",
"reference": "1f4e8351e0196562f5e8ec584baeceeb8e2e92f6",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/0f685c099aca7ba86bcc31850186dbfe84a4a8a1",
"reference": "0f685c099aca7ba86bcc31850186dbfe84a4a8a1",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
"php": ">=5.3.9",
"symfony/polyfill-ctype": "~1.8"
},
"type": "library",
"extra": {
@@ -1069,20 +1071,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
"time": "2018-01-03 07:36:31"
"time": "2018-06-21 09:24:14"
},
{
"name": "symfony/finder",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "9786ccb6a1f94a89ae18fc6a1b68de1f070823ed"
"reference": "995cd7c28a0778cece02e2133b4d813dc509dfc3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/9786ccb6a1f94a89ae18fc6a1b68de1f070823ed",
"reference": "9786ccb6a1f94a89ae18fc6a1b68de1f070823ed",
"url": "https://api.github.com/repos/symfony/finder/zipball/995cd7c28a0778cece02e2133b4d813dc509dfc3",
"reference": "995cd7c28a0778cece02e2133b4d813dc509dfc3",
"shasum": ""
},
"require": {
@@ -1118,20 +1120,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2018-01-29 08:54:45"
"time": "2018-06-19 11:07:17"
},
{
"name": "symfony/http-foundation",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "686464910bbe58a2b38eb1f898aa45dc6c4de0cb"
"reference": "f0332229bfecb3c3d3c983f2139f39dd73d2723a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/686464910bbe58a2b38eb1f898aa45dc6c4de0cb",
"reference": "686464910bbe58a2b38eb1f898aa45dc6c4de0cb",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/f0332229bfecb3c3d3c983f2139f39dd73d2723a",
"reference": "f0332229bfecb3c3d3c983f2139f39dd73d2723a",
"shasum": ""
},
"require": {
@@ -1173,20 +1175,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2018-01-29 08:54:45"
"time": "2018-06-19 14:38:49"
},
{
"name": "symfony/http-kernel",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "af74cd947d63ae1294aed71b9456f2a04f7f6d45"
"reference": "5f01e7b4a82458906e81231993abe1fbb7b25fbc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/af74cd947d63ae1294aed71b9456f2a04f7f6d45",
"reference": "af74cd947d63ae1294aed71b9456f2a04f7f6d45",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/5f01e7b4a82458906e81231993abe1fbb7b25fbc",
"reference": "5f01e7b4a82458906e81231993abe1fbb7b25fbc",
"shasum": ""
},
"require": {
@@ -1194,7 +1196,8 @@
"psr/log": "~1.0",
"symfony/debug": "^2.6.2",
"symfony/event-dispatcher": "^2.6.7|~3.0.0",
"symfony/http-foundation": "~2.7.36|~2.8.29|~3.1.6"
"symfony/http-foundation": "~2.7.36|~2.8.29|~3.1.6",
"symfony/polyfill-ctype": "~1.8"
},
"conflict": {
"symfony/config": "<2.7",
@@ -1256,20 +1259,75 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"time": "2018-01-29 10:48:12"
"time": "2018-06-25 12:01:56"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.7.0",
"name": "symfony/polyfill-ctype",
"version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b"
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b",
"reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
"reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.8-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Ctype\\": ""
},
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
},
{
"name": "Gert de Pagter",
"email": "BackEndTea@gmail.com"
}
],
"description": "Symfony polyfill for ctype functions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"ctype",
"polyfill",
"portable"
],
"time": "2018-04-30 19:57:29"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "3296adf6a6454a050679cde90f95350ad604b171"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
"reference": "3296adf6a6454a050679cde90f95350ad604b171",
"shasum": ""
},
"require": {
@@ -1281,7 +1339,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.7-dev"
"dev-master": "1.8-dev"
}
},
"autoload": {
@@ -1315,20 +1373,20 @@
"portable",
"shim"
],
"time": "2018-01-30 19:27:44"
"time": "2018-04-26 10:06:28"
},
{
"name": "symfony/polyfill-php54",
"version": "v1.7.0",
"version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php54.git",
"reference": "84e2b616c197ef400c6d0556a0606cee7c9e21d5"
"reference": "6c3a2b84c6025e4ea3f6a19feac35408c64b22e1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/84e2b616c197ef400c6d0556a0606cee7c9e21d5",
"reference": "84e2b616c197ef400c6d0556a0606cee7c9e21d5",
"url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/6c3a2b84c6025e4ea3f6a19feac35408c64b22e1",
"reference": "6c3a2b84c6025e4ea3f6a19feac35408c64b22e1",
"shasum": ""
},
"require": {
@@ -1337,7 +1395,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.7-dev"
"dev-master": "1.8-dev"
}
},
"autoload": {
@@ -1373,20 +1431,20 @@
"portable",
"shim"
],
"time": "2018-01-30 19:27:44"
"time": "2018-04-26 10:06:28"
},
{
"name": "symfony/polyfill-php55",
"version": "v1.7.0",
"version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php55.git",
"reference": "168371cb3dfb10e0afde96e7c2688be02470d143"
"reference": "a39456128377a85f2c5707fcae458678560cba46"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/168371cb3dfb10e0afde96e7c2688be02470d143",
"reference": "168371cb3dfb10e0afde96e7c2688be02470d143",
"url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/a39456128377a85f2c5707fcae458678560cba46",
"reference": "a39456128377a85f2c5707fcae458678560cba46",
"shasum": ""
},
"require": {
@@ -1396,7 +1454,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.7-dev"
"dev-master": "1.8-dev"
}
},
"autoload": {
@@ -1429,11 +1487,11 @@
"portable",
"shim"
],
"time": "2018-01-30 19:27:44"
"time": "2018-04-26 10:06:28"
},
{
"name": "symfony/proxy-manager-bridge",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/proxy-manager-bridge.git",
@@ -1487,16 +1545,16 @@
},
{
"name": "symfony/routing",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "627ea100720dac15d8165648caac57456dda84aa"
"reference": "39064bae264907e48fe4e8ad5141f6dc6a3932fb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/627ea100720dac15d8165648caac57456dda84aa",
"reference": "627ea100720dac15d8165648caac57456dda84aa",
"url": "https://api.github.com/repos/symfony/routing/zipball/39064bae264907e48fe4e8ad5141f6dc6a3932fb",
"reference": "39064bae264907e48fe4e8ad5141f6dc6a3932fb",
"shasum": ""
},
"require": {
@@ -1507,7 +1565,6 @@
},
"require-dev": {
"doctrine/annotations": "~1.0",
"doctrine/common": "~2.2",
"psr/log": "~1.0",
"symfony/config": "~2.7|~3.0.0",
"symfony/expression-language": "~2.4|~3.0.0",
@@ -1558,20 +1615,20 @@
"uri",
"url"
],
"time": "2018-01-16 18:00:04"
"time": "2018-06-19 09:52:17"
},
{
"name": "symfony/twig-bridge",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/twig-bridge.git",
"reference": "efdc8b39b5a05def32824e578ccf3fcdec8190cc"
"reference": "f56824eed503d9bb65600a262fdb46571672c257"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/twig-bridge/zipball/efdc8b39b5a05def32824e578ccf3fcdec8190cc",
"reference": "efdc8b39b5a05def32824e578ccf3fcdec8190cc",
"url": "https://api.github.com/repos/symfony/twig-bridge/zipball/f56824eed503d9bb65600a262fdb46571672c257",
"reference": "f56824eed503d9bb65600a262fdb46571672c257",
"shasum": ""
},
"require": {
@@ -1591,7 +1648,7 @@
"symfony/http-kernel": "~2.8|~3.0.0",
"symfony/polyfill-intl-icu": "~1.0",
"symfony/routing": "~2.2|~3.0.0",
"symfony/security": "~2.6|~3.0.0",
"symfony/security": "^2.8.31|^3.3.13",
"symfony/security-acl": "~2.6|~3.0.0",
"symfony/stopwatch": "~2.2|~3.0.0",
"symfony/templating": "~2.1|~3.0.0",
@@ -1643,24 +1700,25 @@
],
"description": "Symfony Twig Bridge",
"homepage": "https://symfony.com",
"time": "2018-01-03 17:12:09"
"time": "2018-05-17 10:20:34"
},
{
"name": "symfony/yaml",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "be720fcfae4614df204190d57795351059946a77"
"reference": "51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/be720fcfae4614df204190d57795351059946a77",
"reference": "be720fcfae4614df204190d57795351059946a77",
"url": "https://api.github.com/repos/symfony/yaml/zipball/51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff",
"reference": "51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
"php": ">=5.3.9",
"symfony/polyfill-ctype": "~1.8"
},
"type": "library",
"extra": {
@@ -1692,20 +1750,20 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2018-01-03 07:36:31"
"time": "2018-05-01 22:52:40"
},
{
"name": "twig/twig",
"version": "v1.35.0",
"version": "v1.35.3",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "daa657073e55b0a78cce8fdd22682fddecc6385f"
"reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/daa657073e55b0a78cce8fdd22682fddecc6385f",
"reference": "daa657073e55b0a78cce8fdd22682fddecc6385f",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
"reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
"shasum": ""
},
"require": {
@@ -1713,8 +1771,8 @@
},
"require-dev": {
"psr/container": "^1.0",
"symfony/debug": "~2.7",
"symfony/phpunit-bridge": "~3.3@dev"
"symfony/debug": "^2.7",
"symfony/phpunit-bridge": "^3.3"
},
"type": "library",
"extra": {
@@ -1757,7 +1815,7 @@
"keywords": [
"templating"
],
"time": "2017-09-27 18:06:46"
"time": "2018-03-20 04:25:58"
},
{
"name": "zendframework/zend-code",
@@ -2299,23 +2357,23 @@
},
{
"name": "phpspec/prophecy",
"version": "1.7.5",
"version": "1.7.6",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
"reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
"reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
"reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
"sebastian/comparator": "^1.1|^2.0",
"sebastian/comparator": "^1.1|^2.0|^3.0",
"sebastian/recursion-context": "^1.0|^2.0|^3.0"
},
"require-dev": {
@@ -2358,7 +2416,7 @@
"spy",
"stub"
],
"time": "2018-02-19 10:16:54"
"time": "2018-04-18 13:57:24"
},
{
"name": "phpunit/dbunit",
@@ -3352,16 +3410,16 @@
},
{
"name": "symfony/browser-kit",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
"reference": "e49a78bcf09ba2e6d03e63e80211f889c037add5"
"reference": "11ccc2ebefba78c1bb0a2d2d2dd4b4e09a5fba02"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/e49a78bcf09ba2e6d03e63e80211f889c037add5",
"reference": "e49a78bcf09ba2e6d03e63e80211f889c037add5",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/11ccc2ebefba78c1bb0a2d2d2dd4b4e09a5fba02",
"reference": "11ccc2ebefba78c1bb0a2d2d2dd4b4e09a5fba02",
"shasum": ""
},
"require": {
@@ -3405,20 +3463,20 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
"time": "2018-01-03 07:36:31"
"time": "2018-03-19 21:11:56"
},
{
"name": "symfony/css-selector",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "c5b39674eacd34adedbef78227c57109caa9e318"
"reference": "3cdc270724e4666006118283c700a4d7f9cbe264"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/c5b39674eacd34adedbef78227c57109caa9e318",
"reference": "c5b39674eacd34adedbef78227c57109caa9e318",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/3cdc270724e4666006118283c700a4d7f9cbe264",
"reference": "3cdc270724e4666006118283c700a4d7f9cbe264",
"shasum": ""
},
"require": {
@@ -3458,24 +3516,25 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
"time": "2018-01-03 07:36:31"
"time": "2018-03-10 18:19:36"
},
{
"name": "symfony/dom-crawler",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "31ff8f1d7a3de4b43b35ff821e6e223d81a8988b"
"reference": "a01b1fa5322847d1d51aa61f74c86b438c2f34e8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/31ff8f1d7a3de4b43b35ff821e6e223d81a8988b",
"reference": "31ff8f1d7a3de4b43b35ff821e6e223d81a8988b",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/a01b1fa5322847d1d51aa61f74c86b438c2f34e8",
"reference": "a01b1fa5322847d1d51aa61f74c86b438c2f34e8",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
@@ -3514,20 +3573,20 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
"time": "2018-01-03 07:36:31"
"time": "2018-05-01 22:52:40"
},
{
"name": "symfony/process",
"version": "v2.8.34",
"version": "v2.8.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "905efe90024caa75a2fc93f54e14b26f2a099d96"
"reference": "542d88b350c42750fdc14e73860ee96dd423e95d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/905efe90024caa75a2fc93f54e14b26f2a099d96",
"reference": "905efe90024caa75a2fc93f54e14b26f2a099d96",
"url": "https://api.github.com/repos/symfony/process/zipball/542d88b350c42750fdc14e73860ee96dd423e95d",
"reference": "542d88b350c42750fdc14e73860ee96dd423e95d",
"shasum": ""
},
"require": {
@@ -3563,7 +3622,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2018-01-29 08:54:45"
"time": "2018-05-27 07:40:52"
}
],
"aliases": [],

View File

@@ -50,6 +50,7 @@
<ol>
<li><a href="#changelog">Changelog</a>
<ul>
<li><a href="#v323rc1">Changes since 3.2.3-RC1</a></li>
<li><a href="#v322">Changes since 3.2.2</a></li>
<li><a href="#v321">Changes since 3.2.1</a></li>
<li><a href="#v320">Changes since 3.2.0</a></li>
@@ -129,6 +130,29 @@
<div class="inner">
<div class="content">
<a name="v323rc1"></a><h3>Changes since 3.2.3-RC1</h3>
<h4>Bug</h4>
<ul>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11847">PHPBB3-11847</a>] - auth_provider_oauth migration must depend on at least one migration that ensures the module tables exist as expected</li>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15548">PHPBB3-15548</a>] - Dead link in ACP_COOKIE_SETTINGS_EXPLAIN language entry</li>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15586">PHPBB3-15586</a>] - When creating a module without the modes array a missing 'module_langname' index is accessed</li>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15613">PHPBB3-15613</a>] - Notification dropdown said to be not RTL compliant</li>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15627">PHPBB3-15627</a>] - Improve wording of YES_ACCURATE_PM_BUTTON + EXPLAIN</li>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15678">PHPBB3-15678</a>] - PHP warning in filesystem.php</li>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15731">PHPBB3-15731</a>] - Fix acp_search language parameters when deleting index</li>
</ul>
<h4>Improvement</h4>
<ul>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15630">PHPBB3-15630</a>] - Change &lt;b&gt; to &lt;strong&gt; </li>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15633">PHPBB3-15633</a>] - Remove extra space in GROUP_MAX_RECIPIENTS_EXPLAIN</li>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15657">PHPBB3-15657</a>] - Add core.mcp_queue_get_posts_for_posts_query_before and core.mcp_queue_get_posts_modify_post_row</li>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15676">PHPBB3-15676</a>] - Display privacy policy &amp; terms of use more prominently</li>
</ul>
<h4>Task</h4>
<ul>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15677">PHPBB3-15677</a>] - Updated dependencies for 3.2.3-RC2</li>
</ul>
<a name="v322"></a><h3>Changes since 3.2.2</h3>
<h4>Bug</h4>
<ul>

View File

@@ -44,7 +44,7 @@
<p>
A basic overview of running phpBB can be found in the accompanying <a href="README.html">README</a> file.
Please ensure you read that document in addition to this! For more detailed information on using, installing,
updating and converting phpBB you should read <a href="https://www.phpbb.com/support/docs/en/3.1/ug/">the documentation</a>
updating and converting phpBB you should read <a href="https://www.phpbb.com/support/docs/en/3.2/ug/">the documentation</a>
available online.
</p>
</div>

View File

@@ -349,7 +349,7 @@ class acp_search
$totaltime = microtime(true) - $starttime;
$rows_per_second = $row_count / $totaltime;
meta_refresh(1, append_sid($this->u_action . '&amp;action=delete&amp;skip_rows=' . $post_counter . '&amp;hash=' . generate_link_hash('acp_search')));
trigger_error($user->lang('SEARCH_INDEX_DELETE_REDIRECT', (int) $row_count, $post_counter, $rows_per_second));
trigger_error($user->lang('SEARCH_INDEX_DELETE_REDIRECT', (int) $row_count, $post_counter) . $user->lang('SEARCH_INDEX_DELETE_REDIRECT_RATE', $rows_per_second));
}
}

View File

@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
*/
// phpBB Version
@define('PHPBB_VERSION', '3.2.3-RC1');
@define('PHPBB_VERSION', '3.2.3-RC2');
// QA-related
// define('PHPBB_QA', 1);

View File

@@ -2463,7 +2463,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
$s_hidden_fields = build_hidden_fields($s_hidden_fields);
$template->assign_vars(array(
$login_box_template_data = array(
'LOGIN_ERROR' => $err,
'LOGIN_EXPLAIN' => $l_explain,
@@ -2471,6 +2471,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
'U_RESEND_ACTIVATION' => ($config['require_activation'] == USER_ACTIVATION_SELF && $config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '',
'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
'UA_PRIVACY' => addslashes(append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy')),
'S_DISPLAY_FULL_LOGIN' => ($s_display) ? true : false,
'S_HIDDEN_FIELDS' => $s_hidden_fields,
@@ -2480,7 +2481,29 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
'USERNAME_CREDENTIAL' => 'username',
'PASSWORD_CREDENTIAL' => ($admin) ? 'password_' . $credential : 'password',
));
);
/**
* Event to add/modify login box template data
*
* @event core.login_box_modify_template_data
* @var int admin Flag whether user is admin
* @var string username User name
* @var int autologin Flag whether autologin is enabled
* @var string redirect Redirect URL
* @var array login_box_template_data Array with the login box template data
* @since 3.2.3-RC2
*/
$vars = array(
'admin',
'username',
'autologin',
'redirect',
'login_box_template_data',
);
extract($phpbb_dispatcher->trigger_event('core.login_box_modify_template_data', compact($vars)));
$template->assign_vars($login_box_template_data);
page_header($user->lang['LOGIN']);
@@ -4404,6 +4427,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
'U_TEAM' => ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team'),
'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
'UA_PRIVACY' => addslashes(append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy')),
'U_RESTORE_PERMISSIONS' => ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '',
'U_FEED' => $controller_helper->route('phpbb_feed_index'),

View File

@@ -501,6 +501,29 @@ class mcp_queue
AND t.topic_id = p.topic_id
AND u.user_id = p.poster_id
ORDER BY ' . $sort_order_sql;
/**
* Alter sql query to get information on all posts in queue
*
* @event core.mcp_queue_get_posts_for_posts_query_before
* @var string sql String with the query to be executed
* @var array forum_list List of forums that contain the posts
* @var int visibility_const Integer with one of the possible ITEM_* constant values
* @var int topic_id topic_id in the page request
* @var string limit_time_sql String with the SQL code to limit the time interval of the post (Note: May be empty string)
* @var string sort_order_sql String with the ORDER BY SQL code used in this query
* @since 3.2.3-RC2
*/
$vars = array(
'sql',
'forum_list',
'visibility_const',
'topic_id',
'limit_time_sql',
'sort_order_sql',
);
extract($phpbb_dispatcher->trigger_event('core.mcp_queue_get_posts_for_posts_query_before', compact($vars)));
$result = $db->sql_query($sql);
$post_data = $rowset = array();
@@ -588,7 +611,7 @@ class mcp_queue
$row['post_username'] = $row['username'] ?: $user->lang['GUEST'];
}
$template->assign_block_vars('postrow', array(
$post_row = array(
'U_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&amp;t=' . $row['topic_id']),
'U_VIEWFORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']),
'U_VIEWPOST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&amp;p=' . $row['post_id']) . (($mode == 'unapproved_posts') ? '#p' . $row['post_id'] : ''),
@@ -606,7 +629,25 @@ class mcp_queue
'TOPIC_TITLE' => $row['topic_title'],
'POST_TIME' => $user->format_date($row['post_time']),
'S_HAS_ATTACHMENTS' => $auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']) && $row['post_attachment'],
));
);
/**
* Alter sql query to get information on all topics in the list of forums provided.
*
* @event core.mcp_queue_get_posts_modify_post_row
* @var array post_row Template variables for current post
* @var array row Post data
* @var array forum_names Forum names
* @since 3.2.3-RC2
*/
$vars = array(
'post_row',
'row',
'forum_names',
);
extract($phpbb_dispatcher->trigger_event('core.mcp_queue_get_posts_modify_post_row', compact($vars)));
$template->assign_block_vars('postrow', $post_row);
}
unset($rowset, $forum_names);

View File

@@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli')
define('IN_PHPBB', true);
define('IN_INSTALL', true);
define('PHPBB_ENVIRONMENT', 'production');
define('PHPBB_VERSION', '3.2.3-RC1');
define('PHPBB_VERSION', '3.2.3-RC2');
$phpbb_root_path = __DIR__ . '/../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);

View File

@@ -280,7 +280,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.3-RC1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.3-RC2');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');

View File

@@ -348,7 +348,7 @@ $lang = array_merge($lang, array(
// Cookie Settings
$lang = array_merge($lang, array(
'ACP_COOKIE_SETTINGS_EXPLAIN' => 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in. If you have problems with users staying logging in to your board, visit the <b><a href="https://www.phpbb.com/support/go/cookie-settings/">phpBB.com Knowledge Base - Fixing incorrect cookie settings</a></b>.',
'ACP_COOKIE_SETTINGS_EXPLAIN' => 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in. If you have problems with users staying logging in to your board, visit the <strong><a href="https://www.phpbb.com/support/go/cookie-settings">phpBB.com Knowledge Base - Fixing incorrect cookie settings</a></strong>.',
'COOKIE_DOMAIN' => 'Cookie domain',
'COOKIE_DOMAIN_EXPLAIN' => 'In most cases the cookie domain is optional. Leave it blank if you are unsure.<br><br> In the case where you have a board integrated with other software or have multiple domains, then to determine the cookie domain you need to do the following. If you have something like <i>example.com</i> and <i>forums.example.com</i>, or perhaps <i>forums.example.com</i> and <i>blog.example.com</i>. Remove the subdomains until you find the common domain, <i>example.com</i>. Now add a dot in front of the common domain and you would enter .example.com (note the dot at the beginning).',
@@ -404,10 +404,10 @@ $lang = array_merge($lang, array(
'READ_NOTIFICATION_EXPIRE_DAYS_EXPLAIN' => 'Number of days that will elapse before a read notification will automatically be deleted. Set this value to 0 to make notifications permanent.',
'RECOMPILE_STYLES' => 'Recompile stale style components',
'RECOMPILE_STYLES_EXPLAIN' => 'Check for updated style components on filesystem and recompile.',
'YES_ACCURATE_PM_BUTTON' => 'Enable permission specific PM button in topic pages',
'YES_ACCURATE_PM_BUTTON_EXPLAIN' => 'If this setting is enabled, only post profiles of users who are permitted to read private messages will have a private message button.',
'YES_ANON_READ_MARKING' => 'Enable topic marking for guests',
'YES_ANON_READ_MARKING_EXPLAIN' => 'Stores read/unread status information for guests. If disabled, posts are always marked read for guests.',
'YES_ACCURATE_PM_BUTTON' => 'Enable accurate PM indicator in topic pages',
'YES_ACCURATE_PM_BUTTON_EXPLAIN' => 'If this setting is enabled, only users who are permitted to read private messages will have a private message button.',
'YES_BIRTHDAYS' => 'Enable birthday listing',
'YES_BIRTHDAYS_EXPLAIN' => 'If disabled the birthday listing is no longer displayed. To let this setting take effect the birthday feature needs to be enabled too.',
'YES_JUMPBOX' => 'Enable display of jumpbox',

View File

@@ -92,7 +92,7 @@ $lang = array_merge($lang, array(
'GROUP_OPEN' => 'Open',
'GROUP_PENDING' => 'Pending members',
'GROUP_MAX_RECIPIENTS' => 'Maximum number of allowed recipients per private message',
'GROUP_MAX_RECIPIENTS_EXPLAIN' => 'The maximum number of allowed recipients in a private message. The maximum for all groups of the user is used to determine the actual value.<br />Set this value to 0 to overwrite the setting for all users of this group with the board-wide setting.',
'GROUP_MAX_RECIPIENTS_EXPLAIN' => 'The maximum number of allowed recipients in a private message. The maximum for all groups of the user is used to determine the actual value.<br />Set this value to 0 to overwrite the setting for all users of this group with the board-wide setting.',
'GROUP_OPTIONS_SAVE' => 'Group wide options',
'GROUP_PROMOTE' => 'Promote to group leader',
'GROUP_RANK' => 'Group rank',

View File

@@ -116,7 +116,10 @@ $lang = array_merge($lang, array(
2 => 'The current rate of indexing is approximately %1$.1f posts per second.<br />Indexing in progress…',
),
'SEARCH_INDEX_DELETE_REDIRECT' => array(
2 => 'All posts up to post id %2$d have been removed from the search index.<br />Deleting in progress…',
2 => 'All posts up to post id %2$d have been removed from the search index, of which %1$d posts were within this step.<br />',
),
'SEARCH_INDEX_DELETE_REDIRECT_RATE' => array(
2 => 'The current rate of deleting is approximately %1$.1f posts per second.<br />Deleting in progress…',
),
'SEARCH_INDEX_CREATED' => 'Successfully indexed all posts in the board database.',
'SEARCH_INDEX_REMOVED' => 'Successfully deleted the search index for this backend.',

View File

@@ -37,7 +37,7 @@ if (empty($lang) || !is_array($lang))
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
$lang = array_merge($lang, array(
'RECAPTCHA_LANG' => 'en',
'RECAPTCHA_LANG' => 'en-GB', // Find the language/country code on https://developers.google.com/recaptcha/docs/language - If no code exists for your language you can use "en" or leave the string empty
'RECAPTCHA_NOT_AVAILABLE' => 'In order to use reCaptcha, you must create an account on <a href="http://www.google.com/recaptcha">www.google.com/recaptcha</a>.',
'CAPTCHA_RECAPTCHA' => 'reCaptcha',
'RECAPTCHA_INCORRECT' => 'The solution you provided was incorrect',

View File

@@ -193,7 +193,7 @@ $lang = array_merge($lang, array(
'DAYS' => 'Days',
'DELETE' => 'Delete',
'DELETE_ALL' => 'Delete all',
'DELETE_COOKIES' => 'Delete all board cookies',
'DELETE_COOKIES' => 'Delete cookies',
'DELETE_MARKED' => 'Delete marked',
'DELETE_POST' => 'Delete post',
'DELIMITER' => 'Delimiter',
@@ -608,6 +608,7 @@ $lang = array_merge($lang, array(
'PREVIOUS' => 'Previous', // Used in pagination
'PREVIOUS_STEP' => 'Previous',
'PRIVACY' => 'Privacy policy',
'PRIVACY_LINK' => 'Privacy',
'PRIVATE_MESSAGE' => 'Private message',
'PRIVATE_MESSAGES' => 'Private messages',
'PRIVATE_MESSAGING' => 'Private messaging',
@@ -732,6 +733,7 @@ $lang = array_merge($lang, array(
'SUBMIT' => 'Submit',
'TB' => 'TB',
'TERMS_LINK' => 'Terms',
'TERMS_USE' => 'Terms of use',
'TEST_CONNECTION' => 'Test connection',
'THE_TEAM' => 'The team',

View File

@@ -111,8 +111,8 @@ $lang = array_merge($lang, array(
'HELP_FAQ_LOGIN_CANNOT_REGISTER_QUESTION' => 'Why cant I register?',
'HELP_FAQ_LOGIN_COPPA_ANSWER' => 'COPPA, or the Childrens Online Privacy Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that phpBB Limited and the owners of this board cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined in question “Who do I contact about abusive and/or legal matters related to this board?”.',
'HELP_FAQ_LOGIN_COPPA_QUESTION' => 'What is COPPA?',
'HELP_FAQ_LOGIN_DELETE_COOKIES_ANSWER' => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. Cookies also provide functions such as read tracking if they have been enabled by a board administrator. If you are having login or logout problems, deleting board cookies may help.',
'HELP_FAQ_LOGIN_DELETE_COOKIES_QUESTION' => 'What does the “Delete all board cookies” do?',
'HELP_FAQ_LOGIN_DELETE_COOKIES_ANSWER' => '“Delete cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. Cookies also provide functions such as read tracking if they have been enabled by a board administrator. If you are having login or logout problems, deleting board cookies may help.',
'HELP_FAQ_LOGIN_DELETE_COOKIES_QUESTION' => 'What does the “Delete cookies” do?',
'HELP_FAQ_LOGIN_LOST_PASSWORD_ANSWER' => 'Dont panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click <em>I forgot my password</em>. Follow the instructions and you should be able to log in again shortly.<br />However, if you are not able to reset your password, contact a board administrator.',
'HELP_FAQ_LOGIN_LOST_PASSWORD_QUESTION' => 'Ive lost my password!',
'HELP_FAQ_LOGIN_REGISTER_ANSWER' => 'You may not have to, it is up to the administrator of the board as to whether you need to register in order to post messages. However; registration will give you access to additional features not available to guest users such as definable avatar images, private messaging, emailing of fellow users, usergroup subscription, etc. It only takes a few moments to register so it is recommended you do so.',

View File

@@ -20,6 +20,11 @@ class auth_provider_oauth extends \phpbb\db\migration\migration
return $this->db_tools->sql_table_exists($this->table_prefix . 'auth_provider_oauth');
}
static public function depends_on()
{
return array('\phpbb\db\migration\data\v30x\release_3_0_0');
}
public function update_schema()
{
return array(

View File

@@ -0,0 +1,36 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb\db\migration\data\v32x;
class v323rc2 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return phpbb_version_compare($this->config['version'], '3.2.3-RC2', '>=');
}
static public function depends_on()
{
return array(
'\phpbb\db\migration\data\v32x\v323rc1',
);
}
public function update_data()
{
return array(
array('config.update', array('version', '3.2.3-RC2')),
);
}
}

View File

@@ -519,12 +519,6 @@ class module implements \phpbb\db\migration\tool\tool_interface
// Allow '' to be sent as 0
$parent_id = $parent_id ?: 0;
// If automatic adding is in action, convert array back to string to simplify things
if (is_array($data) && count($data) == 1)
{
$data = $data['module_langname'];
}
if (!is_numeric($parent_id))
{
// Refresh the $module_categories array

View File

@@ -17,7 +17,7 @@ use Symfony\Component\Debug\ErrorHandler;
class error_handler extends ErrorHandler
{
public function handleError($type, $message, $file, $line, array $context, array $backtrace = null)
public function handleError($type, $message, $file, $line)
{
if ($type === E_USER_WARNING || $type === E_USER_NOTICE)
{
@@ -26,6 +26,6 @@ class error_handler extends ErrorHandler
$handler($type, $message, $file, $line);
}
return parent::handleError($type, $message, $file, $line, $context, $backtrace);
return parent::handleError($type, $message, $file, $line);
}
}

View File

@@ -367,7 +367,7 @@ class filesystem implements filesystem_interface
$common_php_group = @filegroup(__FILE__);
// And the owner and the groups PHP is running under.
$php_uid = (function_exists('posic_getuid')) ? @posix_getuid() : false;
$php_uid = (function_exists('posix_getuid')) ? @posix_getuid() : false;
$php_gids = (function_exists('posix_getgroups')) ? @posix_getgroups() : false;
// If we are unable to get owner/group, then do not try to set them by guessing

View File

@@ -8,11 +8,34 @@
<div class="copyright">
<!-- EVENT overall_footer_copyright_prepend -->
{CREDIT_LINE}
<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
<p class="footer-row">
<span class="footer-copyright">{{ CREDIT_LINE }}</span>
</p>
<!-- IF TRANSLATION_INFO -->
<p class="footer-row">
<span class="footer-copyright">{{ TRANSLATION_INFO }}</span>
</p>
<!-- ENDIF -->
<!-- EVENT overall_footer_copyright_append -->
<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
<p class="footer-row">
<a class="footer-link" href="{{ U_PRIVACY }}" title="{{ lang('PRIVACY_LINK') }}" role="menuitem">
<span class="footer-link-text">Privacy</span>
</a>
|
<a class="footer-link" href="{{ U_TERMS_USE }}" title="{{ lang('TERMS_LINK') }}" role="menuitem">
<span class="footer-link-text">Terms</span>
</a>
</p>
<!-- IF DEBUG_OUTPUT -->
<p class="footer-row">
<span class="footer-info">{{ DEBUG_OUTPUT }}</span>
</p>
<!-- ENDIF -->
<!-- IF U_ACP -->
<p class="footer-row">
<a class="footer-link text-strong" href="{{ U_ACP }}">{{ lang('ACP') }}</a>
</p>
<!-- ENDIF -->
</div>
<div id="darkenwrapper" class="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
@@ -78,7 +101,7 @@
"message": "{LA_COOKIE_CONSENT_MSG}",
"dismiss": "{LA_COOKIE_CONSENT_OK}",
"link": "{LA_COOKIE_CONSENT_INFO}",
"href": "{LA_COOKIE_CONSENT_HREF}"
"href": "{UA_PRIVACY}"
}
});
});

View File

@@ -981,8 +981,15 @@ fieldset.fields1 dl.pmlist dd.recipients {
/* Miscellaneous styles
---------------------------------------- */
.copyright {
padding: 5px;
font-size: 10px;
text-align: center;
padding: 10px;
}
.footer-row {
font-size: 10px;
line-height: 1.8;
margin: 0;
}
.small {

View File

@@ -0,0 +1,37 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace foo\bar\acp;
class acp_test_info
{
public function module()
{
return array(
'filename' => '\foo\bar\acp\acp_test_module',
'title' => 'ACP_NEW_MODULE',
'modes' => array(
'mode_1' => array(
'title' => 'ACP_NEW_MODULE_MODE_1',
'auth' => '',
'cat' => array('ACP_NEW_MODULE'),
),
'mode_2' => array(
'title' => 'ACP_NEW_MODULE_MODE_2',
'auth' => '',
'cat' => array('ACP_NEW_MODULE'),
),
),
);
}
}

View File

@@ -0,0 +1,25 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace foo\bar\acp;
class acp_test_module
{
var $u_action;
function main($id, $mode)
{
$this->tpl_name = 'foobar';
$this->page_title = 'Bertie';
}
}

View File

@@ -0,0 +1,24 @@
{
"name": "foo/bar",
"type": "phpbb-extension",
"description": "An example/sample extension to be used for testing purposes in phpBB Development.",
"version": "1.0.0",
"time": "2012-02-15 01:01:01",
"license": "GNU GPL v2",
"authors": [{
"name": "John Smith",
"username": "JohnSmith27",
"email": "email@phpbb.com",
"homepage": "http://phpbb.com",
"role": "N/A"
}],
"require": {
"php": ">=5.4.7"
},
"extra": {
"display-name": "phpBB BarFoo Extension",
"soft-require": {
"phpbb/phpbb": "3.2.*@dev"
}
}
}

View File

@@ -0,0 +1,37 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace foo\bar\ucp;
class ucp_test_info
{
public function module()
{
return array(
'filename' => '\foo\bar\ucp\ucp_test_module',
'title' => 'UCP_NEW_MODULE',
'modes' => array(
'mode_1' => array(
'title' => 'UCP_NEW_MODULE_MODE_1',
'auth' => '',
'cat' => array('UCP_NEW_MODULE'),
),
'mode_2' => array(
'title' => 'UCP_NEW_MODULE_MODE_2',
'auth' => '',
'cat' => array('UCP_NEW_MODULE'),
),
),
);
}
}

View File

@@ -0,0 +1,25 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace foo\bar\ucp;
class ucp_test_module
{
var $u_action;
function main($id, $mode)
{
$this->tpl_name = 'foobar';
$this->page_title = 'Bertie';
}
}

View File

@@ -11,6 +11,9 @@
*
*/
require_once dirname(__FILE__) . '/ext/foo/bar/acp/acp_test_info.php';
require_once dirname(__FILE__) . '/ext/foo/bar/ucp/ucp_test_info.php';
class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
{
public function getDataSet()
@@ -39,6 +42,9 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
$auth = $this->getMock('\phpbb\auth\auth');
$phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
// Correctly set the root path for this test to this directory, so the classes can be found
$phpbb_root_path = dirname(__FILE__) . '/';
$phpbb_extension_manager = new phpbb_mock_extension_manager($phpbb_root_path);
$module_manager = new \phpbb\module\module_manager($cache, $this->db, $phpbb_extension_manager, MODULES_TABLE, $phpbb_root_path, $phpEx);
@@ -403,6 +409,35 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
$this->fail($e);
}
$this->assertEquals(true, $this->tool->exists('ucp', 'UCP_NEW_SUBCAT', 'UCP_NEW_MODULE'));
// Test adding new UCP module the automatic way, single mode
try
{
$this->tool->add('ucp', 'UCP_NEW_CAT', array(
'module_basename' => '\foo\bar\ucp\ucp_test_module',
'modes' => array('mode_1'),
));
}
catch (Exception $e)
{
$this->fail($e);
}
$this->assertEquals(true, $this->tool->exists('ucp', 'UCP_NEW_CAT', 'UCP_NEW_MODULE_MODE_1'));
$this->assertEquals(false, $this->tool->exists('ucp', 'UCP_NEW_CAT', 'UCP_NEW_MODULE_MODE_2'));
// Test adding new ACP module the automatic way, all modes
try
{
$this->tool->add('acp', 'ACP_NEW_CAT', array(
'module_basename' => '\foo\bar\acp\acp_test_module',
));
}
catch (Exception $e)
{
$this->fail($e);
}
$this->assertEquals(true, $this->tool->exists('acp', 'ACP_NEW_CAT', 'ACP_NEW_MODULE_MODE_1'));
$this->assertEquals(true, $this->tool->exists('acp', 'ACP_NEW_CAT', 'ACP_NEW_MODULE_MODE_2'));
}
public function test_remove()