From e7c8fed6ab99c99dd04086681b8305df4c795e37 Mon Sep 17 00:00:00 2001
From: Andrew Short <andrewjshort@gmail.com>
Date: Fri, 4 Oct 2013 00:20:32 +1000
Subject: [PATCH] FIX: Move stage choosing into a pre-request filter.

This ensures that the correct stage is selected, even if the request
does not come through the model as controller system. This fixes an
issue where custom controllers would always be on the "Stage" stage.
---
 _config/requestprocessors.yml      |  8 ++++++++
 control/VersionedRequestFilter.php | 17 +++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 _config/requestprocessors.yml
 create mode 100644 control/VersionedRequestFilter.php

diff --git a/_config/requestprocessors.yml b/_config/requestprocessors.yml
new file mode 100644
index 000000000..1e9310bd3
--- /dev/null
+++ b/_config/requestprocessors.yml
@@ -0,0 +1,8 @@
+---
+Name: requestprocessors
+---
+Injector:
+  RequestProcessor:
+    properties:
+      filters:
+        - '%$VersionedRequestFilter'
diff --git a/control/VersionedRequestFilter.php b/control/VersionedRequestFilter.php
new file mode 100644
index 000000000..c6158cc4f
--- /dev/null
+++ b/control/VersionedRequestFilter.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Initialises the versioned stage when a request is made.
+ *
+ * @package framework
+ * @subpackage control
+ */
+class VersionedRequestFilter {
+
+	public function preRequest() {
+		Versioned::choose_site_stage();
+	}
+
+	public function postRequest() {
+	}
+
+}