app/controllers/scrivito/ui_controller.rb in scrivito_sdk-0.50.1 vs app/controllers/scrivito/ui_controller.rb in scrivito_sdk-0.60.0.rc1

@@ -9,10 +9,10 @@
   end
 
   private
 
   def editing_context
-    request.env[EditingContextMiddleware::ENVKEY] || EditingContext.new
+    EditingContextMiddleware.from_request(request)
   end
 end
 
 end