Andreas Fischer
7c2115d95a
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
2015-04-27 22:15:57 +02:00
Tristan Darricau
734b89e75c
Merge pull request #3524 from marc1706/ticket/8672
...
[ticket/8672] Add class for retrieving imagesize without download
2015-04-27 16:26:40 +02:00
Alexander Köplinger
e25e411e2b
[ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
...
The code was added as a workaround for bugs in very old versions of IIS,
dating back to 2002: see commit 849d766974
.
Newer IIS versions handle the 'Location' header just fine, so we can avoid
the unnecessary HTML page for redirects. Given that it seems to work fine
since IIS 6.0 (on WinServer 2003), I don't think it's worth adding a special
check for earlier versions as they are no longer supported by MS as well.
PHPBB3-12101
2015-04-26 22:10:06 +02:00
Andreas Fischer
e7d2977401
Merge pull request #3548 from s9e/ticket/12745
...
[ticket/12745] Allow Unicode characters from the SMP to be used in text
* s9e/ticket/12745:
[ticket/12745] Added HTML entity test
[ticket/12745] Added support for Unicode characters outside BMP
[ticket/12745] Updated s9e\TextFormatter
2015-04-26 20:25:14 +02:00
Marc Alexander
03eae6fddd
Merge branch '3.1.x'
2015-04-26 09:24:09 +02:00
Marc Alexander
59a178f3cb
Merge pull request #3532 from prototech/ticket/13755
...
[ticket/13755] Ignore dots in path when determining file extension.
2015-04-26 09:24:03 +02:00
JoshyPHP
25acba2259
[ticket/12745] Added support for Unicode characters outside BMP
...
PHPBB3-12745
2015-04-25 23:43:32 +02:00
Andreas Fischer
80d4fb1847
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
2015-04-25 18:11:19 +02:00
Andreas Fischer
0fc70d4b15
Merge pull request #3550 from bantu/ticket/13765-3.1.4
...
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
* bantu/ticket/13765-3.1.4:
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
2015-04-25 18:11:07 +02:00
Andreas Fischer
901875a1fb
Merge branch 'ticket/13765' into ticket/13765-3.1.4
...
* ticket/13765:
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
Conflicts:
phpBB/includes/functions.php
phpBB/includes/startup.php
2015-04-25 17:41:17 +02:00
Joas Schilling
463c62df18
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
...
PHPBB3-13765
2015-04-25 17:22:10 +02:00
Marc Alexander
55c5bc126d
[ticket/8672] User $user->lang() instead of sprintf
...
PHPBB3-8672
2015-04-24 13:34:18 +02:00
Marc Alexander
39d6180c68
[ticket/8672] Use fastImageSize in classes
...
PHPBB3-8672
2015-04-24 13:33:14 +02:00
Marc Alexander
2fa99602c6
[ticket/8672] Add class for retrieving imagesize without download
...
getimagesize() always downloads the complete file before checking
the actual image dimensions. This class will be able to do the same
without having to download possibly large files.
PHPBB3-8672
2015-04-24 13:31:36 +02:00
Tristan Darricau
c89384eb86
Merge pull request #3446 from MateBartus/ticket/13654
...
[ticket/13654] Moving reporting into controller
2015-04-16 21:30:52 +02:00
Tristan Darricau
f077b72d0d
Merge pull request #3487 from MateBartus/ticket/13697
...
[ticket/13697] Moving filesystem related functions to filesystem service
2015-04-16 20:44:02 +02:00
MateBartus
4bdef6fd21
[ticket/13697] Moving filesystem related functions to filesystem service
...
* Moving filesystem service to \phpbb\filesystem namespace
* Wraping Symfony's Filesystem component
* Moving filesystem related functions from includes/functions.php
into \phpbb\filesystem\filesystem
Functions moved (and deprecated):
- phpbb_chmod
- phpbb_is_writable
- phpbb_is_absolute
- phpbb_own_realpath
- phpbb_realpath
* Adding interface for filesystem service
PHPBB3-13697
2015-04-16 13:24:10 +02:00
MateBartus
a089ff5eb0
[ticket/13654] Moving reporting into controller
...
Moving report.php's content into different services and controllers to
better comply with the MVC model.
Also implementing:
* Replacement for reasons_display()
* Adding assign_meta_refresh_var() to \controller\helper
* Adding separate routes for easy configuration
* Updating unit tests to expect to correct results
* Add BC tests
PHPBB3-13654
2015-04-16 11:29:11 +02:00
Cesar G
47514ca2df
[ticket/13755] Ignore dots in path when determining file extension.
...
PHPBB3-13755
2015-04-10 16:23:51 -07:00
Joas Schilling
a151ad912a
[3.1.x] Update development version to 3.1.5-dev
2015-04-10 09:56:20 +02:00
Joas Schilling
313a224c68
Update version to 3.1.4-RC1
2015-04-09 20:26:12 +02:00
Joas Schilling
34b768cfaf
Merge branch '3.1.x'
2015-04-06 11:31:58 +02:00
Joas Schilling
23db98276f
Merge pull request #3409 from Senky/ticket/11424
...
[ticket/11424] Quick-Mod Tools race condition results in NO_MODE
2015-04-06 11:31:53 +02:00
Tristan Darricau
3a6a61a8dd
Merge pull request #3461 from s9e/ticket/11768
...
[3.2][ticket/11768] Integrate s9e\TextFormatter
2015-04-05 23:32:38 +02:00
Tristan Darricau
5ac13c7ddc
Merge branch '3.1.x'
2015-04-05 23:22:41 +02:00
Tristan Darricau
30cf75a011
Merge pull request #3430 from MateBartus/ticket/12466
...
[ticket/12466] Move classes from acp_database.php to their own files
2015-04-05 20:13:38 +02:00
rxu
3521e74939
[ticket/13743] Add $phpbb_root_path and $phpEx definitions in message_parser.php
...
message_parser.php performs include of bbcode.php at the very start using
$phpbb_root_path and $phpEx vars, so there's a possibility those can be
undefined at that point, especially when message_parser.php is being included
in event listener or another extension file where $phpbb_root_path and $phpEx
don't exist. This can be fixed by adding the appropriate vars definitions.
PHPBB3-13743
2015-04-05 18:48:43 +07:00
JoshyPHP
718ace2121
[ticket/11768] Updated annotation [ci skip]
...
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
37106bae7a
[ticket/11768] Reverted change to bbcode_uid
...
On the off-chance some other routine expect bbcode_uid to never be empty.
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
ec77ff7838
[ticket/11768] Invalidate the text_formatter cache whenever a style is installed
...
The acp_styles module purges the cache every time a style is uninstalled,
modified or made default, but it does not purge the cache when a new style
is installed. Here we invalidate the text_formatter cache (not purge the
whole cache) so that new styles take effect immediately.
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
cfbf02bcba
[ticket/11768] Re-added the code that got lost in rebase
...
PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
147a713cc0
[ticket/11768] This commit integrates s9e\TextFormatter
...
This commit integrates s9e\TextFormatter as outlined in
http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=44467
PHPBB3-11768
2015-04-02 19:16:01 +02:00
Nicofuma
a3f7e0f441
Merge branch '3.1.x'
2015-03-29 19:50:58 +02:00
Nicofuma
d9f4964d91
Merge pull request #3376 from marc1706/ticket/13568-asc
...
[ticket/13568] Validate imagick path as readable absolute path
closes #3376
2015-03-29 19:50:19 +02:00
Nicofuma
b9db47e3f5
Merge pull request #3359 from marc1706/ticket/13568
...
[ticket/13568] Validate imagick path as readable absolute path
closes #3359
2015-03-29 19:41:13 +02:00
Nicofuma
9e66a10bac
Merge branch '3.1.x'
2015-03-24 23:57:26 +01:00
Nicofuma
50b3c2b49e
Merge pull request #3398 from marc1706/ticket/13612
...
[ticket/13612] Run meta refresh until extension is fully enabled
2015-03-24 23:32:29 +01:00
Nicofuma
9a5aefd4c2
Merge branch '3.1.x'
2015-03-24 23:20:03 +01:00
Cesar G
0bc2f9f242
[ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.
...
LOGIN_ERROR_PASSWORD may be returned as the message if the password is invalid
while hitting the LOGIN_ERROR_ATTEMPTS error.
PHPBB3-13698
2015-03-23 17:52:17 -07:00
Cesar G
8a6e3f208a
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13719] Remove superfluous $search_options in acp_search.
2015-03-23 09:43:43 -07:00
brunoais
754b5d6349
[ticket/13719] Remove superfluous $search_options in acp_search.
...
PHPBB3-13719
2015-03-23 12:58:05 +00:00
Marc Alexander
6f3ca35ae7
Merge branch '3.1.x'
2015-03-10 15:20:28 +01:00
Marc Alexander
3cb1907e76
Merge pull request #3445 from RMcGirr83/ticket/13650
...
[ticket/13650] Move core event
2015-03-10 15:20:26 +01:00
Marc Alexander
3a4e1ce215
Merge branch '3.1.x'
2015-03-07 21:23:59 +01:00
Marc Alexander
2348580255
Merge pull request #3452 from RobertHeim/ticket/13658
...
[ticket/13658] add event before and after topics are deleted
2015-03-07 21:23:57 +01:00
Marc Alexander
5e7560845b
Merge branch '3.1.x'
2015-03-06 14:36:22 +01:00
Marc Alexander
d7f4715b96
Merge pull request #3473 from RMcGirr83/ticket/13675
...
[ticket/13675] Add validate to acp_profile event and add template events
2015-03-06 14:36:20 +01:00
Marc Alexander
bd22b8319b
Merge branch '3.1.x'
2015-03-06 14:30:14 +01:00
Marc Alexander
3d7def4196
Merge pull request #3450 from brunoais/ticket/13142
...
[ticket/13142] Before query to get the total number of reports
2015-03-06 14:30:11 +01:00
Marc Alexander
2eb7c21ae0
Merge branch '3.1.x'
2015-03-06 13:50:44 +01:00