1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-20 15:40:30 +01:00

23829 Commits

Author SHA1 Message Date
Tristan Darricau
2a7c514cd0 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14437] Make sure attachments array is properly ordered before processing
  [ticket/14437] Preserve attachment ID order by ordering by attach_id
  [ticket/14437] Sort attachments after assigning inline attachments
  [ticket/14437] Correctly assume index from attachment display order
2016-03-25 11:48:29 +01:00
Tristan Darricau
7f9ba9849b Merge pull request #4190 from marc1706/ticket/14437
[ticket/14437] Correctly assume index from attachment display order

* marc1706/ticket/14437:
  [ticket/14437] Make sure attachments array is properly ordered before processing
  [ticket/14437] Preserve attachment ID order by ordering by attach_id
  [ticket/14437] Sort attachments after assigning inline attachments
  [ticket/14437] Correctly assume index from attachment display order
2016-03-25 11:48:29 +01:00
Tristan Darricau
3eb6f7176a Merge pull request #4193 from marc1706/ticket/14497
[ticket/14497] Support second app.php script in install folder

* marc1706/ticket/14497:
  [ticket/14497] Do not check for doctype on index and use correct return
  [ticket/14497] Add test for visiting installer
  [ticket/14497] Use nginx sample config in travis tests
  [ticket/14497] Support second app.php script in install folder
2016-03-25 11:46:15 +01:00
Tristan Darricau
6774c5077d Merge pull request #4214 from marc1706/ticket/14241
[ticket/14241] Prevent empty q&a as a result of improper settings

* marc1706/ticket/14241:
  [ticket/14241] Log fatal captcha error to error log
  [ticket/14241] Prevent empty q&a as a result of improper settings
2016-03-25 11:43:05 +01:00
Tristan Darricau
e873ed6944 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14241] Log fatal captcha error to error log
  [ticket/14241] Prevent empty q&a as a result of improper settings
2016-03-25 11:43:05 +01:00
Tristan Darricau
8d98981012 Merge pull request #4218 from marc1706/ticket/14527
[ticket/14527] Retrieve link URL from href and not link text

* marc1706/ticket/14527:
  [ticket/14527] Decode automatically generated postlink without prefix
  [ticket/14527] Add tests for reverted improper fix
  [ticket/14527] Retrieve link URL from href and not link text
2016-03-25 11:35:47 +01:00
Tristan Darricau
f29ebb1846 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13630] Prevent empty parameter select_single
2016-03-25 11:20:56 +01:00
Tristan Darricau
2168cb7f8e Merge pull request #4231 from Senky/ticket/13630
[ticket/13630] Prevent empty parameter select_single

* Senky/ticket/13630:
  [ticket/13630] Prevent empty parameter select_single
2016-03-25 11:20:06 +01:00
Tristan Darricau
28f0c3457c Merge pull request #4239 from marc1706/ticket/14530
[ticket/14530] Only generate text again if sig was parsed for storage

* marc1706/ticket/14530:
  [ticket/14530] Only generate text again if sig was parsed for storage
  [ticket/14530] Add accidentally removed sig_parsed flag
2016-03-25 11:14:33 +01:00
Tristan Darricau
4212c304ab Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14290] Correctly use modified since header
2016-03-25 11:10:06 +01:00
Tristan Darricau
f6cc30cbfe Merge pull request #4245 from JoshyPHP/ticket/14381
[ticket/14381] Set the mode in message parser to "reparse"

* JoshyPHP/ticket/14381:
  [ticket/14381] Set the mode in message parser to "reparse"
  [ticket/14495] Updates the version to 3.3.0-a1-dev
2016-03-25 11:03:27 +01:00
Marc Alexander
23be4d8af2 Merge pull request #4237 from Nicofuma/ticket/14555
[ticket/14555] Uniformize cache directory usages
2016-03-24 21:15:13 +01:00
JoshyPHP
0ff4a6b6a4 [ticket/14381] Set the mode in message parser to "reparse"
The default mode is "post". By setting it to something else,
all limits pertaining to posts (min/max length, etc...) should
be disabled.

PHPBB3-14381
2016-03-24 19:49:23 +01:00
Marc Alexander
826b338275 [ticket/14290] Correctly use modified since header
PHPBB3-14290
2016-03-24 18:09:51 +01:00
Tristan Darricau
a9b6a537c5 Merge pull request #4243 from marc1706/ticket/14136-3.2.x
[ticket/14136] Add back X-UA-Compatible meta tag

* marc1706/ticket/14136-3.2.x:
  [ticket/14136] Add back X-UA-Compatible meta tag
2016-03-24 18:00:42 +01:00
Tristan Darricau
3a23068d89 Merge pull request #4242 from marc1706/ticket/14136
[ticket/14136] Add back X-UA-Compatible meta tag

* marc1706/ticket/14136:
  [ticket/14136] Add back X-UA-Compatible meta tag
2016-03-24 18:00:15 +01:00
Tristan Darricau
7e2c8f1885 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14536] Force unix time stamps to be integer
2016-03-24 17:53:57 +01:00
Tristan Darricau
dcb6154be7 Merge pull request #4222 from marc1706/ticket/14536
[ticket/14536] Force unix time stamps to be integer

* marc1706/ticket/14536:
  [ticket/14536] Force unix time stamps to be integer
2016-03-24 17:53:34 +01:00
Marc Alexander
51c243f76b Merge branch '3.1.x' into 3.2.x 2016-03-24 17:22:07 +01:00
Marc Alexander
d817da6049 Merge pull request #4227 from Senky/ticket/14318
[ticket/14318] Fix SQL error in Notifications Board migration
2016-03-24 16:33:15 +01:00
Marc Alexander
2e3f89444a Merge branch 'ticket/14136' into ticket/14136-3.2.x
Conflicts:
	phpBB/adm/style/install_update_diff.html
	phpBB/adm/style/installer_header.html
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html
2016-03-24 16:12:56 +01:00
Marc Alexander
244d171cb0 [ticket/14136] Add back X-UA-Compatible meta tag
This was previously removed without needing to. Adding it back to force
users to not emulate the page for previous versions of IE. The
imagetoolbar http-equiv tag was not restored as IE does not contain that
anymore since IE7. Also, the chome=1 has been removed from the
X-UA-Compatible content as ChromeFrame does not receive any further
updates since 2014 and is potentially broken.

PHPBB3-14136
2016-03-24 16:07:07 +01:00
rxu
a5790597ca [ticket/14051] Restore accidentally removed $topics_count value
PHPBB3-14051
2016-03-24 21:41:41 +07:00
Marc Alexander
ed21921c58 Merge branch '3.1.x' into 3.2.x 2016-03-24 15:22:38 +01:00
Marc Alexander
a4fac6da2a Merge pull request #4238 from RMcGirr83/ticket_14051
[ticket/14051] Replace sql array of viewforum sort topics function
2016-03-24 15:22:30 +01:00
Richard McGirr
78bf53587a [ticket/14051] Add table alias and fix types of property
PHPBB3-14051
2016-03-24 07:01:57 -04:00
Marc Alexander
2a6e8f3668 Merge branch '3.1.x' into 3.2.x 2016-03-24 11:49:31 +01:00
Marc Alexander
1bb4e3621e Merge pull request #4175 from Senky/ticket/14471
[ticket/14471] Add $filedata to core.avatar_driver_upload_move_file_before event
2016-03-24 11:49:24 +01:00
Marc Alexander
d8bcf479bf Merge branch '3.2.x' 2016-03-24 11:21:36 +01:00
Marc Alexander
200bcae2ae Merge branch '3.1.x' into 3.2.x 2016-03-24 11:21:31 +01:00
Marc Alexander
c36892f2fa Merge pull request #4113 from LaxSlash/ticket/14395
[ticket/14395] Add event core.viewtopic_add_quickmod_option_before
2016-03-24 11:21:24 +01:00
Marc Alexander
a66ec6eccf [ticket/14530] Only generate text again if sig was parsed for storage
PHPBB3-14530
2016-03-24 11:01:54 +01:00
Marc Alexander
c5ef29a6f1 [ticket/14530] Add accidentally removed sig_parsed flag
This was removed by accident previously while moving from the use of the
old bbcode class to the generate_test_for_display function.

PHPBB3-14530
2016-03-24 10:41:43 +01:00
Tristan Darricau
56c2caf6c0 [ticket/14555] Uniformize cache directory usages
PHPBB3-14555
2016-03-24 09:15:34 +01:00
Richard McGirr
d9ad14e4c5 [ticket/14051] Fix whitespace
PHPBB3-14051
2016-03-23 21:46:45 -04:00
Richard McGirr
c003611f05 [ticket/14051] Replace sql array of viewforum sort topics function
PHPBB3-14051
2016-03-23 21:30:30 -04:00
LaxSlash
8f396673fe [ticket/14395] core.viewtopic_add_quickmod_option_before
Added an event before the function phpbb_add_quickmod_option is called in
the viewtopic.php file. This event serves two purposes - one, it is easier to
add new quickmod options, and two, it allows an extenstion developer to check
additional permissions and apply further authentication for the display of the
quickmod options.

PHPBB3-14395
2016-03-23 20:11:20 -04:00
LaxSlash
a18c59317f [ticket/14395] core.viewtopic_add_quickmod_option_before
Added an event before the function phpbb_add_quickmod_option is called in
the viewtopic.php file. This event serves two purposes - one, it is easier to
add new quickmod options, and two, it allows an extenstion developer to check
additional permissions and apply further authentication for the display of the
quickmod options.

PHPBB3-14395
2016-03-23 14:57:18 -04:00
Marc Alexander
827f11cf83 Merge branch '3.2.x' 2016-03-23 14:47:07 +01:00
Marc Alexander
10d4093561 [ticket/14536] Force unix time stamps to be integer
This will ensure to prevent PHP fatal errors in case the passed timestamp
is an empty string or does not evaluate to an integer (i.e. strings like
foobar).

PHPBB3-14536
2016-03-23 14:44:31 +01:00
Tristan Darricau
dc097221d8 [ticket/14550] Fix the number of characters returned by unique_id()
PHPBB3-14450
2016-03-23 10:18:22 +01:00
LaxSlash
8a8428d002 [ticket/14395] core.viewtopic_add_quickmod_option_before
Added an event before the function phpbb_add_quickmod_option is called in
the viewtopic.php file. This event serves two purposes - one, it is easier to
add new quickmod options, and two, it allows an extenstion developer to check
additional permissions and apply further authentication for the display of the
quickmod options.

PHPBB3-14395
2016-03-22 19:29:33 -04:00
Jakub Senko
f77142c0b6 [ticket/13630] Prevent empty parameter select_single
PHPBB3-13630
2016-03-20 16:58:35 +01:00
Jakub Senko
933938a1d8 [ticket/14318] Fix SQL error in Notifications Board migration
PHPBB3-14318
2016-03-18 11:04:01 +01:00
Tristan Darricau
04450e1fae Merge branch '3.2.x'
* 3.2.x:
  [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
2016-03-16 19:10:45 +01:00
Tristan Darricau
eca4726f3c Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
2016-03-16 19:10:34 +01:00
rxu
e610b23916 [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
Swapping conditions in the function accept() of the class
\phpbb\recursive_dot_prefix_filter_iterator saves a lot of isDir() calls which
is more expensive than $filename[0] checks.

PHPBB3-14540
2016-03-17 00:50:08 +07:00
Tristan Darricau
1c61fd54d4 Merge branch '3.2.x'
* 3.2.x:
  [ticket/14538] Update dependencies for 3.2.x
  [ticket/14538] Update composer dependencies
2016-03-15 20:25:55 +01:00
Marc Alexander
a92ce812e7 [ticket/14538] Update dependencies for 3.2.x
PHPBB3-14538
2016-03-15 13:37:26 +01:00
Marc Alexander
67d58aa7b8 Merge branch 'ticket/14538' into ticket/14538-3.2.x 2016-03-15 13:30:50 +01:00