1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-15 13:24:10 +02:00

27582 Commits

Author SHA1 Message Date
Marc Alexander
73900d1857 [ticket/13454] Remove more unused variables
This should be the last part. Off to checking if the changes were correct.

PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
3b9a9bb04a [ticket/13454] Remove double semi-colons
PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
7a6a16e3a5 [ticket/13454] Remove unused variables
This is part 5 and there is more to come.

PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
915a141fc2 [ticket/13454] Fix code sniffer complaints
PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
38f3688217 [ticket/13454] Fix a few issues introduced by overdeleting stuff
PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
266576c6a4 [ticket/13454] Remove unused variables
Part 4

PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
6c25ad4822 [ticket/13454] Remove unused variables
Part 3 should fix tests up a little bit again.

PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
f50ba9ab4f [ticket/13454] Remove unused variables
This is part 2 of the pr.

PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
73e6e5b77f [ticket/13454] Remove unused variables
This is the first part of the changes. More to come.

PHPBB3-13454
2016-01-06 13:51:19 +01:00
Marc Alexander
d0adbe94d5 Merge branch '3.1.x'
Conflicts:
	phpBB/includes/mcp/mcp_main.php
2016-01-06 13:31:15 +01:00
Marc Alexander
e75c04f02a Merge pull request #4109 from marc1706/ticket/14343
[ticket/14343] Added missing $phpbb_dispatcher
2016-01-06 13:30:20 +01:00
Marc Alexander
ea6bcdff52 Merge branch '3.1.x' 2016-01-06 13:26:23 +01:00
Marc Alexander
11b79fec4d Merge pull request #4105 from marc1706/ticket/14387
[ticket/14387] Allow extending avatars by extensions in ACP
2016-01-06 13:26:19 +01:00
Marc Alexander
82b4eb6d3d Merge branch '3.1.x' 2016-01-06 13:22:16 +01:00
Marc Alexander
1a3f783807 Merge pull request #4110 from marc1706/ticket/14386
[ticket/14386] Fix for open_basedir restriction in effect with remote upload avatar
2016-01-06 13:22:16 +01:00
Marc Alexander
b340e45907 Merge pull request #4104 from ErnadoO/ticket/14386
[ticket/14386] Fix for open_basedir restriction in effect with remote upload avatar
2016-01-06 13:20:32 +01:00
Erwan Nader
59481da9da [ticket/14386] Use of sys_get_temp_dir()
PHPBB3-14386
2016-01-06 13:16:03 +01:00
Marc Alexander
ffd6abdeaf Merge remote-tracking branch 'ErnadoO/ticket/14386' into ticket/14386
Conflicts:
	phpBB/includes/functions_upload.php
2016-01-06 13:15:43 +01:00
kasimi
a021956644 [ticket/14343] Added missing $phpbb_dispatcher
PHPBB3-14343
2016-01-06 11:38:22 +01:00
Erwan Nader
73ca420029 [ticket/14386] Use of sys_get_temp_dir()
PHPBB3-14386
2016-01-03 10:01:00 +01:00
Marc Alexander
b3d64b3b59 [ticket/14387] Fix avatar tests after adding get_config_name method
PHPBB3-14387
2016-01-02 17:16:32 +01:00
javiexin
917c864bbf [ticket/14387] Extend avatar-driver by extension in ACP not possible
Create two driver methods to provide the driver config name and the
driver ACP template name, and use them directly when required.
Default driver config name and template name are the same as now.
But new drivers are able to override the config name and template
name with their own, including @vendor_extension. Simplified manager
interface by reducing unneeded methods.

PHPBB3-14387
2016-01-02 17:16:23 +01:00
javiexin
06f4b6926b [ticket/14387] Extend avatar-driver by extension in ACP not possible
Create two driver methods to provide the driver config name and the
driver ACP template name, and use them within the manager method.
Default driver config name and template name are the same as now.
But new drivers are able to override the config name and template
name with their own, including @vendor_extension.

PHPBB3-14387
2016-01-02 17:16:14 +01:00
javiexin
14dc274e9e [ticket/14387] Extend avatar-driver by extension in ACP not possible
Create a driver method to provide the driver config name, and use it
within the manager method. Default driver config name is the same as now.
But new drivers are able to override the config name with their own.

PHPBB3-14387
2016-01-02 17:16:03 +01:00
Marc Alexander
dfa88441de Merge pull request #4102 from JoshyPHP/ticket/10628
[ticket/10628] http:// prepended to "www." urls
2016-01-01 09:55:34 +01:00
Marc Alexander
e0529ecfe8 Merge pull request #4103 from JoshyPHP/ticket/12221
[ticket/12221] URLs Containing javascript: are Garbled
2016-01-01 09:53:59 +01:00
JoshyPHP
2eac5a0ddd [ticket/12221] Added test
PHPBB3-12221
2015-12-28 20:10:42 +01:00
JoshyPHP
7273e24101 [ticket/10628] Added test
Tests that the textarea's content is preserved, that no "http://"
is added to the text or to the preview's HTML and that the www
URL is linkified

PHPBB3-10628
2015-12-28 19:46:46 +01:00
Marc Alexander
0efbb78afa Merge branch '3.1.x' 2015-12-26 22:10:41 +01:00
Marc Alexander
296243f34f Merge pull request #4100 from marc1706/ticket/14303
[ticket/14303] Use UTF8 quotes in app.php lang file
2015-12-26 22:10:38 +01:00
phpBB España
bb5a171674 [ticket/14303] Use UTF8 quotes in app.php lang file
PHPBB3-14303
2015-12-26 08:14:33 +01:00
Marc Alexander
fc97c7137d Merge pull request #4099 from marc1706/ticket/14371
[ticket/14371] Small fix for the quick links alignment
2015-12-24 15:16:21 +01:00
Melvin García
5e8105a1cd [ticket/14371] Small fix for the quick links alignment
PHPBB3-14371
2015-12-24 14:00:34 +01:00
Marc Alexander
b1e4a3e1b7 Merge pull request #4094 from Nicofuma/ticket/14377
[ticket/14377] Allow extensions to register compiler pass
2015-12-23 19:27:19 +01:00
Tristan Darricau
d256d81a51 [ticket/14377] Handle new $classname() in the sniffer
PHPBB3-14377
2015-12-23 18:45:37 +01:00
Marc Alexander
6a4e296c43 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_im.html
2015-12-23 13:32:44 +01:00
Marc Alexander
84ed888cb9 Merge pull request #4084 from exussum12/ticket/14046
[ticket/14046] Jabber message incorrect
2015-12-23 13:32:23 +01:00
Marc Alexander
e6887ec10a Merge pull request #4096 from CHItA/ticket/14380
[ticket/14380] Maintain consistent template var paths in 3.2 installer
2015-12-22 22:52:52 +01:00
Mate Bartus
84171c5776 [ticket/14380] Maintain consistent template var paths in 3.2 installer
PHPBB3-14380
2015-12-22 21:52:05 +01:00
Máté Bartus
26b068f5b3 Merge pull request #4095 from marc1706/ticket/14378
[ticket/14378] Use consistent template variable paths
2015-12-22 21:43:19 +01:00
Marc Alexander
c02fc0f63f [ticket/14378] Use consistent template variable paths
PHPBB3-14378
2015-12-22 20:02:44 +01:00
Marc Alexander
d033597c5d Merge branch '3.1.x'
Conflicts:
	phpBB/adm/style/installer_footer.html
2015-12-22 19:51:21 +01:00
Marc Alexander
a7ca311d6c Merge pull request #4093 from VSEphpbb/ticket/14374
[ticket/14374] Update dynamic fallback jquery CDN script tag
2015-12-22 19:34:22 +01:00
Tristan Darricau
d44e34aa14 [ticket/14377] Allow extensions to register compiler pass
PHPBB3-14377
2015-12-22 18:48:49 +01:00
Matt Friedman
1654caf34b [ticket/14374] Update dynamic fallback jquery CDN script tag
PHPBB3-14374
2015-12-22 09:29:29 -08:00
Tristan Darricau
332ca57942 Merge pull request #4091 from marc1706/ticket/14373
[ticket/14373] Do not pass arrays to strpos()

* marc1706/ticket/14373:
  [ticket/14373] Do not pass arrays to strpos()
2015-12-22 15:40:48 +01:00
Marc Alexander
2fe81c1ccb [ticket/14373] Do not pass arrays to strpos()
PHPBB3-14373
2015-12-20 22:20:56 +01:00
Marc Alexander
c2a5411dcb Merge pull request #4076 from Nicofuma/ticket/14177
[ticket/14177] Uses Symfony's Debug ErrorHandler in development environment
2015-12-20 12:59:23 +01:00
Marc Alexander
96bd531701 Merge pull request #4087 from VSEphpbb/ticket/14368
[ticket/14368] Fix color of post editor input boxes
2015-12-20 11:03:44 +01:00
Matt Friedman
11ad71b381 [ticket/14368] Fix color of post editor input boxes
https://tracker.phpbb.com/browse/PHPBB3-14368

PHPBB3-14368
2015-12-19 10:29:22 -08:00