1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-18 23:51:49 +02:00
Commit Graph

1878 Commits

Author SHA1 Message Date
Andreas Fischer
2535e9da00 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13504] Fix invalid variable $user
2015-01-19 23:23:57 +01:00
Joas Schilling
7e8bb68999 [ticket/13504] Fix invalid variable $user
PHPBB3-13504
2015-01-19 21:42:22 +01:00
Tristan Darricau
a537bf9619 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13192] Add test for app.php in external subfolder
  [ticket/13192] Use ltrim() instead of preg_replace()
  [ticket/13192] Order test cases consistently
  [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root
  [ticket/13192] Pass correct parameters and rename method to get_valid_page
  [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals
  [ticket/13192] Use get_valid_user_page method in build_url function
  [ticket/13192] Add method for generating valid user page links
2015-01-19 17:52:37 +01:00
Tristan Darricau
add3d3e760 Merge pull request #3055 from marc1706/ticket/13192
[ticket/13192] Add method for generating valid user page links based on mod_rewrite

* marc1706/ticket/13192:
  [ticket/13192] Add test for app.php in external subfolder
  [ticket/13192] Use ltrim() instead of preg_replace()
  [ticket/13192] Order test cases consistently
  [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root
  [ticket/13192] Pass correct parameters and rename method to get_valid_page
  [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals
  [ticket/13192] Use get_valid_user_page method in build_url function
  [ticket/13192] Add method for generating valid user page links
2015-01-19 16:45:43 +01:00
Tristan Darricau
98937a7a18 Merge pull request #3289 from MGaetan89/ticket/13450
[ticket/13450] Type-hint return value of $phpbb_container->get()

* MGaetan89/ticket/13450:
  [ticket/13450] Type-hint return value of $phpbb_container->get()
2015-01-14 12:34:28 +01:00
Joas Schilling
853733a0eb Merge branch 'develop-ascraeus' into develop 2015-01-13 23:31:37 +01:00
Joas Schilling
e3e16a0166 Merge pull request #3234 from brunoais/ticket/13154
[ticket/13154] Event to edit user list for notification in notifications
2015-01-13 23:31:28 +01:00
Gaëtan Muller
b5544b2f47 [ticket/13450] Type-hint return value of $phpbb_container->get()
PHPBB3-13450
2015-01-12 20:19:07 +01:00
Gaëtan Muller
35d37fdff4 [ticket/13498] Update calls to get_user_avatar()
PHPBB3-13498
2015-01-11 21:09:21 +01:00
Joas Schilling
93b3e72f54 Merge branch 'develop-ascraeus' into develop 2015-01-10 22:01:30 +01:00
Joas Schilling
bfba52781b Merge pull request #3210 from brunoais/ticket/13147
[ticket/13147] Change get_global_visibility_sql()'s results
2015-01-10 22:00:07 +01:00
brunoais
e0733ae435 [ticket/13147] New line before comment block
PHPBB3-13147
2015-01-10 17:15:54 +00:00
brunoais
ef9abd7165 [ticket/13147] Override variable name changed by request
PHPBB3-13147
2015-01-10 17:15:22 +00:00
Marc Alexander
b4a2beff24 Merge branch 'develop-ascraeus' into develop 2015-01-10 16:25:44 +01:00
Joas Schilling
f756632185 [ticket/13486] Fix typo in method name
PHPBB3-13486
2015-01-10 15:14:58 +01:00
Marc Alexander
45ccd2d44a Merge branch 'develop-ascraeus' into develop 2015-01-10 13:18:21 +01:00
Marc Alexander
c28ef9afdd Merge pull request #3195 from nickvergessen/ticket/13238-asc
[ticket/13238] Do not drop indexes that do not exist from fulltext search
2015-01-10 13:17:59 +01:00
brunoais
8ed5a047ec [ticket/13147] Wrong extra new line
PHPBB3-13147
2015-01-10 11:48:01 +00:00
Marc Alexander
e6509aaf60 [ticket/13192] Use ltrim() instead of preg_replace()
PHPBB3-13192
2015-01-10 12:46:40 +01:00
brunoais
9caec668af [ticket/13147] Renaming content_replaced->get_global_visibility_sql_overwrite
Renamed content_replaced to get_global_visibility_sql_overwrite in order to
follow the convention in other events' variables that have the same basic
function

PHPBB3-13147
2015-01-10 11:44:55 +00:00
brunoais
a09c38f1cc [ticket/13147] Removing globals and using injection
Using globals is NG. Using a parameter instead.

PHPBB3-13147
2015-01-10 11:44:54 +00:00
brunoais
0f6a0d820e [ticket/13147] Using $phpbb_dispatcher global var
PHPBB3-13147
2015-01-10 11:44:54 +00:00
brunoais
8f5e3d5efb [ticket/13147] Allow changing the result of calling get_global_visibility_sql
PHPBB3-13147
2015-01-10 11:44:52 +00:00
Marc Alexander
3cfbe7bb4f Merge branch 'develop-ascraeus' into develop 2015-01-10 12:37:11 +01:00
Marc Alexander
67c987f0d0 Merge pull request #3166 from nickvergessen/Senky-ticket/12866
[ticket/12866] Wrong profile field validation options
2015-01-10 12:36:49 +01:00
Joas Schilling
56eae4660c Merge branch 'develop-ascraeus' into develop 2015-01-10 12:30:06 +01:00
Joas Schilling
bf59d8dd74 Merge pull request #3209 from brunoais/ticket/13146
[ticket/13146] Allow changing the result of calling get_forums_visibility_sql
2015-01-10 12:29:48 +01:00
brunoais
cea35c486c [ticket/13146] Removed stray empty line
PHPBB3-13146
2015-01-10 09:55:43 +00:00
Joas Schilling
6b328912ce Merge branch 'develop-ascraeus' into develop 2015-01-10 00:12:59 +01:00
Joas Schilling
8ae1b0c52e Merge pull request #3189 from rxu/ticket/12926
[ticket/12926] Support for IDN (IRI)
2015-01-10 00:09:57 +01:00
Joas Schilling
1981f4f966 Merge branch 'develop-ascraeus' into develop 2015-01-09 18:39:26 +01:00
Joas Schilling
d9bdd05c80 Merge pull request #3128 from omniError/ticket/13306
[ticket/13306] add error level to collector
2015-01-09 18:39:11 +01:00
Joas Schilling
a5007b7abd Merge branch 'develop-ascraeus' into develop 2015-01-09 18:12:02 +01:00
Joas Schilling
3350df131f Merge pull request #3227 from prototech/ticket/13366
[ticket/13366] Ensure plupload_last_gc config entry is dynamic.
2015-01-09 18:11:41 +01:00
Joas Schilling
8f5bbc95dc Merge branch 'develop-ascraeus' into develop 2015-01-09 18:03:34 +01:00
Joas Schilling
65ffc76e2f Merge pull request #3258 from marc1706/ticket/13385
[ticket/13385] Free result in \phpbb\config\db::set_atomic()
2015-01-09 18:03:21 +01:00
Joas Schilling
b9c10e34bb Merge branch 'develop-ascraeus' into develop 2015-01-09 17:36:25 +01:00
Marc Alexander
9d9c57f334 [ticket/13432] Make sure to add language file when including acp_modules
PHPBB3-13432
2015-01-09 13:47:36 +01:00
Marc Alexander
38f184ad6b [ticket/13385] Remove unneeded $result in \phpbb\config\db::set_atomic()
PHPBB3-13385
2015-01-09 13:41:36 +01:00
Joas Schilling
d9109355a3 Merge branch 'develop-ascraeus' into develop 2015-01-06 10:48:34 +01:00
Joas Schilling
6fd8f1b835 Merge pull request #3221 from MasterShredder/ticket/13422
[ticket/13422] New events for save custom cookies and set custom ban type
2015-01-06 10:48:14 +01:00
Joas Schilling
93a85a65d0 Merge branch 'develop-ascraeus' into develop 2015-01-06 10:43:37 +01:00
Joas Schilling
2dab3c8c52 Merge pull request #3211 from brunoais/ticket/13148
[ticket/13148] Creating a final way to modify edit logs output
2015-01-06 10:25:10 +01:00
Marc Alexander
281cc53532 [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root
PHPBB3-13192
2015-01-04 17:41:02 +01:00
brunoais
abc5dbcd71 [ticket/13146] Realign variables and descriptions in event
PHPBB3-13146
2014-12-29 08:42:13 +00:00
brunoais
59ab09273f [ticket/13146] Improved $get_forums_visibility_sql_overwrite's clarity
PHPBB3-13146
2014-12-29 08:40:23 +00:00
brunoais
92d7c16782 [ticket/13148] Wrong version num; copy & paste fail
PHPBB3-13148
2014-12-29 08:23:31 +00:00
brunoais
0104188074 [ticket/13148] Fixed my error
PHPBB3-13148
2014-12-28 20:35:16 +00:00
brunoais
d455dd68f6 [ticket/13148] Fixed syntax error
PHPBB3-13148
2014-12-28 20:25:36 +00:00
brunoais
cf036ea0e8 [ticket/13148] Added more variables as requested
Added more variables as requested and some extra that may be of use.

PHPBB3-13148
2014-12-28 19:52:58 +00:00