diff options
author | Marc Alexander <admin@m-a-styles.de> | 2012-12-09 21:02:31 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2012-12-09 21:02:31 +0100 |
commit | 1aae72961a3205a8487218b6d69361c43a1297d6 (patch) | |
tree | 3096a599c14c88084f782022f002ed84224ccf8b /tests/functional/fixtures/ext/foo/bar/controller.php | |
parent | 26bde05a30c7111b57621a37d86425aa69d74263 (diff) | |
parent | 3fe381eed561e724700b21789e28ea3efb1f7ef9 (diff) | |
download | forums-1aae72961a3205a8487218b6d69361c43a1297d6.tar forums-1aae72961a3205a8487218b6d69361c43a1297d6.tar.gz forums-1aae72961a3205a8487218b6d69361c43a1297d6.tar.bz2 forums-1aae72961a3205a8487218b6d69361c43a1297d6.tar.xz forums-1aae72961a3205a8487218b6d69361c43a1297d6.zip |
Merge branch 'develop' into feature/avatars
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'tests/functional/fixtures/ext/foo/bar/controller.php')
-rw-r--r-- | tests/functional/fixtures/ext/foo/bar/controller.php | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/tests/functional/fixtures/ext/foo/bar/controller.php b/tests/functional/fixtures/ext/foo/bar/controller.php deleted file mode 100644 index 3375e317b3..0000000000 --- a/tests/functional/fixtures/ext/foo/bar/controller.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php - -class phpbb_ext_foo_bar_controller extends phpbb_extension_controller -{ - public function handle() - { - $this->template->set_filenames(array( - 'body' => 'foobar_body.html' - )); - - page_header('Test extension'); - page_footer(); - } -} |