From 156bb87d57d2e6edda8360a96494bae545871b0f 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 +++++++++++++++++
 model/Versioned.php                | 14 --------------
 3 files changed, 25 insertions(+), 14 deletions(-)
 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() {
+	}
+
+}
diff --git a/model/Versioned.php b/model/Versioned.php
index 2d30dae5b..9ff961f62 100644
--- a/model/Versioned.php
+++ b/model/Versioned.php
@@ -1289,21 +1289,7 @@ class Versioned extends DataExtension {
 
 		return $list;
 	}
-	
-	/**
-	 * @param Controller $controller
-	 */
-	public function contentcontrollerInit($controller) {
-		self::choose_site_stage();
-	}
 
-	/**
-	 * @param Controller $controller
-	 */
-	public function modelascontrollerInit($controller) {
-		self::choose_site_stage();
-	}
-	
 	/**
 	 * @param array $labels
 	 */