Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcher

* upstream/develop: (35 commits)
  [ticket/10730] Added label tag around "select" text in post splitting UI
  [ticket/10732] Add config_dev.php and config_test.php to .gitignore
  [ticket/10586] Added space in if statement
  [ticket/10586] Tidy up comments
  [task/php5.3] Updated range of tested PHP versions
  [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
  [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
  [ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket.
  [ticket/10703] Added a condition to check if ext directory exists
  [ticket/10708] Check converted passwords for multi-byte characters
  [ticket/10586] Tests finally work (thanks naderman)
  [ticket/10586] Correctly purge board cache and don't rename install directory
  [ticket/10586] trying to get tests to work
  [ticket/10586] more work on getting tests to pass
  [ticket/10586] Tests are coming along, just a little more to go
  [ticket/10586] Rename install directory back to install/ after tests
  [ticket/10586] browse tests now work, but mine dont. at least we are making progress
  [ticket/10586] initial work on copying fixtures. Note that this depends on 10706
  [ticket/10586] Adding the extensions used by the tests
  [ticket/10586] Now tests run, but fail. But here is what I have.
  ...

1 files changed, 17 insertions, 0 deletions

diff --git a/tests/functional/fixtures/ext/error/class/controller.php b/tests/functional/fixtures/ext/error/class/controller.php
new file mode 100644
index 0000000000..eb2ae362a6
--- /dev/null
+++ b/tests/functional/fixtures/ext/error/class/controller.php
@@ -0,0 +1,17 @@
+<?php
+
+class phpbb_ext_foobar_controller implements phpbb_extension_controller_interface
+{
+	public function handle()
+	{
+		global $template;
+		$template->set_ext_dir_prefix($phpbb_root_path . 'ext/error/class/');
+
+		$template->set_filenames(array(
+			'body' => 'index_body.html'
+		));
+
+		page_header('Test extension');
+		page_footer();
+	}
+}