Merge pull request #25 from christopherdarling/patch-1

FIX CMSPreview 500 error

main.php

@@ -2,25 +2,31 @@
 
 require_once __DIR__.'/../framework/core/Core.php';
 
-$request = new SS_HTTPRequest(
-    $_SERVER['REQUEST_METHOD'],
-    isset($_GET['url']) ? $_GET['url'] : '', 
-    $_GET
-);
+\Versioned::choose_site_stage();
 
-$headers = Director::extract_request_headers($_SERVER);
+// Only skip framework/main.php if live stage
+if (\Versioned::current_stage() == \Versioned::get_live_stage()) {
 
-foreach ($headers as $header => $value) {
-    $request->addHeader($header, $value);
-}
+    $request = new SS_HTTPRequest(
+        $_SERVER['REQUEST_METHOD'],
+        isset($_GET['url']) ? $_GET['url'] : '',
+        $_GET
+    );
 
-$container = Injector::inst();
+    $headers = Director::extract_request_headers($_SERVER);
 
-$session = $container->create('Session', array());
-if (Session::request_contains_session_id()) {
-    $session->inst_start();
-}
+    foreach ($headers as $header => $value) {
+        $request->addHeader($header, $value);
+    }
+
+    $container = Injector::inst();
 
-$container->get('RequestProcessor')->preRequest($request, $session, DataModel::inst());
+    $session = $container->create('Session', array());
+    if (Session::request_contains_session_id()) {
+        $session->inst_start();
+    }
+
+    $container->get('RequestProcessor')->preRequest($request, $session, DataModel::inst());
+}
 
 require_once __DIR__.'/../framework/main.php';