aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/config
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-03-04 13:25:53 -0600
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-03-04 13:25:53 -0600
commit029f096411f620f2066608cd0a1e8711f88da9e1 (patch)
treec470b9a0ebccca8cc3a6d6db6e1baa30556801b0 /phpBB/config
parent5695097b8a691d2c18615e59420ed383b6a34af3 (diff)
parent19c3917de985d04f994bc22bcec1e814aa2e207c (diff)
downloadforums-029f096411f620f2066608cd0a1e8711f88da9e1.tar
forums-029f096411f620f2066608cd0a1e8711f88da9e1.tar.gz
forums-029f096411f620f2066608cd0a1e8711f88da9e1.tar.bz2
forums-029f096411f620f2066608cd0a1e8711f88da9e1.tar.xz
forums-029f096411f620f2066608cd0a1e8711f88da9e1.zip
Merge remote-tracking branch 'remotes/nickv/ticket/10411-2' into develop
# By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/10411-2: (33 commits) [ticket/10411] Fix call to function on non-object $db->...() [ticket/10411] Remove ajax delete, so the page is refreshed [ticket/10411] Update schema file with new table and remove the column [ticket/10411] Add unit tests for move() with values >1 [ticket/10411] Add migrations file for teampage table [ticket/10411] Revert database_update.php changes from for easier update [ticket/10411] Add maxlength to category name input field [ticket/10411] Test for thrown exceptions when group does not exist [ticket/10411] Catch exceptions from grouppositions [ticket/10411] Throw exceptions instead of using trigger_error() [ticket/10411] Add return values to add/delete function [ticket/10411] Add return value to move functions [ticket/10411] Fix typehinting and change private to protected [ticket/10411] Use template loops instead of defining the html in php files [ticket/10411] Ensure we only get services that do exist [ticket/10411] Add a comment why we left join the group table [ticket/10411] Rename template variable CUR_ to CURRENT_ [ticket/10411] Move globals to the top and use array for cache destroy [ticket/10411] Use new ajax callback name row_up/row_down [ticket/10411] Fix logic error when editing/creating a group ...
Diffstat (limited to 'phpBB/config')
-rw-r--r--phpBB/config/services.yml13
1 files changed, 13 insertions, 0 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 250e4a782b..d4db1f291e 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -132,6 +132,19 @@ services:
- .%core.php_ext%
- _ext_finder
+ groupposition.legend:
+ class: phpbb_groupposition_legend
+ arguments:
+ - @dbal.conn
+ - @user
+
+ groupposition.teampage:
+ class: phpbb_groupposition_teampage
+ arguments:
+ - @dbal.conn
+ - @user
+ - @cache.driver
+
http_kernel:
class: Symfony\Component\HttpKernel\HttpKernel
arguments: