1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 12:05:37 +02:00

2028 Commits

Author SHA1 Message Date
JoshyPHP
458cf95b1e [ticket/11768] Replaced class names in annotations with their FQN
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
825bc45983 [ticket/11768] Removed comments
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
3d9596be79 [ticket/11768] Updated renderer annotation
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
694e515f7c [ticket/11768] Replaced \phpbb\textformatter\parser with an interface
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
b12043d4b0 [ticket/11768] Renamed get_words() to get_censored_words()
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
baadc2a6e5 [ticket/11768] Removed unused annotations
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
5fe74cd394 [ticket/11768] Updated censor to apply to XML values
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
73ce09b73a [ticket/11768] Fixed censored words being escaped twice
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
c1ba3a678d [ticket/11768] Added methods to access the library's parser/renderer
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
3e5ee87b15 [ticket/11768] Allowed text in places where text is not valid HTML
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
f721b85a78 [ticket/11768] Replaced the Censor plugin
...with something that is run at rendering time.

PHPBB3-11768
2015-04-02 19:16:01 +02:00
JoshyPHP
6578e1c6ec [ticket/11768] Added limited support for [url] in [quote] author
PHPBB3-11768
2015-04-02 19:16:01 +02:00
JoshyPHP
6bd86a8e8a [ticket/11768] Updated phpbb\textformatter\s9e\factory::regenerate()
Returns an associative array rather than a numerically-indexed array. Feels
cleaner and more extensible.

PHPBB3-11768
2015-04-02 19:16:01 +02:00
JoshyPHP
f6e3e41717 [ticket/11768] Added support for magic links that start with "www."
PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
3b115a903a [ticket/11768] Removed unused use statements
PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
72fb380c9f [ticket/11768] Updated constructors with explicit dependencies
The trade-off is that an instance of phpbb\textformatter\s9e\factory and
phpbb\textformatter\data_access is created on any page that uses the
parser or the renderer, even when neither need to be regenerated. It has
no measureable impact on performance and costs ~20KB of RAM.

PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
e0bb446c57 [ticket/11768] Reorganized code for readability
No functional change intended

PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
dc303cbc99 [ticket/11768] Toggled Unicode modifier in relative URL filter
get_preg_expression('relative_url') returns an expression that requires it

PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
cf39b02891 [ticket/11768] Updated annotations to pass sniff
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
Andreas Fischer
18d3dd54a1 Merge pull request #3507 from VSEphpbb/ticket/13725
[ticket/13725] Coding guidelines: static public

* VSEphpbb/ticket/13725:
  [ticket/13725] Coding guidelines: static public
2015-04-02 12:37:34 +02:00
Matt Friedman
dbb538afbd [ticket/13725] Coding guidelines: static public
PHPBB3-13725
2015-03-27 00:02:20 -07:00
Cesar G
8423ae1201 Merge remote-tracking branch 's9e/ticket/13718'
* s9e/ticket/13718:
  [ticket/13718] Added missing global declaration
2015-03-23 08:49:43 -07:00
JoshyPHP
fd230cd9c5 [ticket/13718] Added missing global declaration
PHPBB3-13718
2015-03-23 01:51:04 +01:00
Marc Alexander
038b27abba Merge branch '3.1.x' 2015-03-16 14:43:22 +01:00
Cesar G
7f7d8d9101 [ticket/13550] Check that the Plupload temp directory is writable before moving
This prevents a PHP warning from being issued that results in an invalid JSON
response being returned to the user.

PHPBB3-13550
2015-03-15 16:06:35 -07:00
Dhruv
24f26478c4 Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/search/fulltext_native.php
2015-03-14 23:44:58 +08:00
brunoais
9b030fd174 [ticket/13674] Missing space after "if"
PHPBB3-13674
2015-03-07 14:57:42 +00:00
brunoais
f4c423cea1 [ticket/13674] Change MySQL native total search results calculation
This changes how the native FULLTEXT search calculates the total
match number for MySQL.
This should improve performance as there is one less query being made
and it is being searched using the technique mentioned in the manual

PHPBB3-13674
2015-03-06 22:23:45 +00:00
Tristan Darricau
cf39cfc593 [ticket/13132] Twig: Add loops content to the root context
PHPBB3-13132
2015-03-05 21:38:59 +01:00
Marc Alexander
a33c99b3fd Merge branch '3.1.x' 2015-03-05 16:02:48 +01:00
Marc Alexander
d0ab101c32 Merge pull request #3453 from RMcGirr83/ticket/13477
[ticket/13477] Update file cache driver for extension paths
2015-03-05 16:02:46 +01:00
Marc Alexander
7c26cd25c7 Merge pull request #3434 from nickvergessen/ticket/13647
[ticket/13647] Move FAQ page to a controller
2015-03-05 15:25:30 +01:00
RMcGirr83
4618a3e2f8 [ticket/13477] rename function and fix doc blocks
PHPBB3-13477
2015-03-04 14:20:27 -05:00
RMcGirr83
5cd4941c55 [ticket/13477] Update file cache driver for filenames
Replace slashes on file name

PHPBB3-13477
2015-03-03 09:31:30 -05:00
Joas Schilling
7e0d54a331 [ticket/13647] Use the Symfony way for redirecting
PHPBB3-13647
2015-02-27 22:58:51 +01:00
Joas Schilling
8ec18b10c3 Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/session.php
2015-02-27 22:47:02 +01:00
Joas Schilling
8abf259273 Merge pull request #3444 from naderman/ticket/13617-ascraeus
[ticket/13617] Enforce column size limit for session_forum_id
2015-02-27 22:44:04 +01:00
Marc Alexander
a11181b5dd Merge branch '3.1.x' 2015-02-27 12:00:27 +01:00
Marc Alexander
0daf148aaa Merge pull request #3384 from brunoais/ticket/13592
[ticket/13592] Allow changing get_visibility_sql's result
2015-02-27 12:00:09 +01:00
Marc Alexander
c9df29d680 Merge pull request #3303 from Nicofuma/ticket/13513
[ticket/13513] Use paths relative to the phpBB root in the router
2015-02-26 13:41:51 +01:00
Nils Adermann
106bc1c232 [ticket/13617] Document magic number for forum_id
PHPBB3-13617
2015-02-25 17:00:22 +01:00
Nils Adermann
c5a15c0635 [ticket/13617] Use request->variable instead of request_var
PHPBB3-13617
2015-02-25 16:58:38 +01:00
Nils Adermann
d08d988df4 Merge branch 'ticket/13617' into ticket/13617-ascraeus
* ticket/13617:
  [ticket/13617] Enforce column size limit for session_forum_id

Conflicts:
	phpBB/phpbb/session.php
2015-02-25 16:25:20 +01:00
Andreas Fischer
b57e00226a Merge branch '3.1.x'
* 3.1.x:
  [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
2015-02-22 23:44:42 +01:00
Andreas Fischer
525a62f72e Merge pull request #3433 from Nicofuma/ticket/13643
[ticket/13643] Change the priority of kernel_terminate_subscriber to -10000

* Nicofuma/ticket/13643:
  [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
2015-02-22 23:44:42 +01:00
Nicofuma
ffc5a73a0c [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
PHP_INT_MIN isn't a defined constant but it can be calculed by
~PHP_INT_MAX (two's complement of PHP_INT_MAX)

PHPBB3-13643
2015-02-22 21:53:05 +01:00
Joas Schilling
0595ab959c [ticket/13647] Move FAQ page to a controller
PHPBB3-13647
2015-02-22 20:20:28 +01:00
Andreas Fischer
71eb981a81 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
2015-02-22 18:57:36 +01:00
Andreas Fischer
d152bbc727 Merge pull request #3427 from prototech/ticket/13551
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN

* prototech/ticket/13551:
  [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
2015-02-22 18:57:35 +01:00