1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-19 08:01:27 +02:00
Commit Graph

3518 Commits

Author SHA1 Message Date
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
brunoais
134a5e0391 [ticket/13661] Brackets in their own line
I didn't even notice that I used my own coding guidelines there...
Thanks to MGaetan89 for pointing it out.

PHPBB3-13661
2015-03-02 12:06:24 +00:00
brunoais
c7cc8a098e [ticket/13661] Re-Fixed $log_type -> $log_time
Thanks to goof for pointing it out...

PHPBB3-13661
2015-03-01 21:17:06 +00:00
brunoais
d53b584c9a [ticket/13661] Wrong event @since version
PHPBB3-13661
2015-03-01 20:44:30 +00:00
brunoais
772bbdfeae [ticket/13661] Removed superfluous whitespace
PHPBB3-13661
2015-03-01 19:58:57 +00:00
brunoais
d0a1650a04 [ticket/13661] bugfix: The conditional is the log_time, not log_type
I mistakenly made the log_type the conditional instead of log_time.
Thankfully, the automated tests helped finding this mistake.

PHPBB3-13661
2015-03-01 18:41:20 +00:00
brunoais
c887eedaa5 [ticket/13661] Fixed the "FROM" in the built query.
I was doing it wrong by giving a string to the FROM clause in the built query.

PHPBB3-13661
2015-03-01 14:07:32 +00:00
brunoais
d66a53a531 [ticket/13661] Add event to allow editing the queries used to get the logs
PHPBB3-13661
2015-03-01 11:56:38 +00:00
brunoais
dbc09bf0d4 [ticket/13661] Transform queries to get logs and log count into built queries
PHPBB3-13661
2015-02-28 20:34:25 +00: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
MateBartus
193c5b86b4 [ticket/12466] Move classes from acp_database.php to their own files
* Moving classes from acp_database.php to phpbb/db/extractor namespace,
   also into separate files
 * Adding DocBlocks and property visibility to classes
 * Removing globals from code
 * Passing former globals to base_extractor's constructor
 * Adding DB extractor as a service, also implementing the extractor interface
   as well as the extractor factory.

PHPBB3-12466
2015-02-27 16:18:50 +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
Marc Alexander
b650f45d55 [ticket/12368] Correctly check if avatars migration is installed
Try to set the avatar type to string value to check if new avatar
types are supported.

PHPBB3-12368
2015-02-24 11:43:33 +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
Andreas Fischer
677337348f Merge branch '3.1.x'
* 3.1.x:
  [ticket/13644] Always type hint dispatch_interface
2015-02-22 17:39:45 +01:00
Nicofuma
9b5493372d [ticket/13644] Always type hint dispatch_interface
PHPBB3-13644
2015-02-22 17:01:37 +01:00
Marc Alexander
8e737e483e [ticket/13522] Remove unneeded variables and correctly output input on error
PHPBB3-13522
2015-02-21 17:46:37 +01:00
Marc Alexander
d15e5372ca [ticket/13522] Use acp_get_question_input() for retrieving input data
PHPBB3-13522
2015-02-21 17:45:17 +01:00
Marc Alexander
12fe882741 [ticket/13522] Trim array elements before processing further
PHPBB3-13522
2015-02-21 17:43:15 +01:00
Joas Schilling
3657d7a85a Merge branch '3.1.x' 2015-02-20 22:26:47 +01:00
Joas Schilling
379eae1a92 Merge pull request #3418 from brunoais/ticket/13631
[ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
2015-02-20 22:26:39 +01:00
Cesar G
71d3ddc623 [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
PHPBB3-13551
2015-02-19 18:38:35 -08:00
brunoais
f0850f1915 [ticket/13631] Better, more explicit comment explanation
PHPBB3-13631
2015-02-18 10:36:29 +00:00
brunoais
997b229723 [ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
I don't get this... I was positive I, at some point, had it right... I don't get
what happened...

PHPBB3-13631
2015-02-18 10:33:49 +00:00
Andreas Fischer
978b96cbf5 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13570] Remove unnecessary ternary condition from mysqli driver
2015-02-17 22:24:15 +01:00
Jakub Senko
f23d2ec42f [ticket/13570] Remove unnecessary ternary condition from mysqli driver
PHPBB3-13570
2015-02-16 20:25:11 +01:00
brunoais
957b23765f [ticket/13621] Prepend $where_sql and postpend closing parentheses on return
Prepend $where_sql and postpend closing parentheses on statements with return

PHPBB3-13621
2015-02-15 18:50:13 +00:00
Joas Schilling
ec1fb0423d [ticket/10748] Split postgres DB tools into it's own class
PHPBB3-10748
2015-02-13 22:49:29 +01:00
Marc Alexander
25b54791f9 [ticket/13493] Append page name to base url if it doesn't contain it
PHPBB3-13493
2015-02-11 13:03:22 +01:00
brunoais
bf20fb03ef [ticket/13592] The name didn't make proper sense
PHPBB3-13592
2015-02-11 10:56:36 +00:00
brunoais
74385b8fce [ticket/13592] Empty line before event comment block.
I had forgotten this one

PHPBB3-13592
2015-02-09 11:58:35 +00:00
brunoais
6111f5fa74 [ticket/13592] Removed unwanted space in self line.
PHPBB3-13592
2015-02-09 11:56:53 +00:00
brunoais
bb7d294190 [ticket/13592] Allow full override of get_visibility_sql()
PHPBB3-13592
2015-02-09 10:44:12 +00:00