Merge pull request #2585 from ss23/3.1-staging-fix

FIX: Move stage choosing into a pre-request filter.

_config/requestprocessors.yml

@@ -0,0 +1,8 @@
+---
+Name: requestprocessors
+---
+Injector:
+  RequestProcessor:
+    properties:
+      filters:
+        - '%$VersionedRequestFilter'

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() {
+	}
+
+}

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
 	 */