From 861f340b81e6faa901df7c12c51a8f8ff431f6a0 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Fri, 5 Feb 2016 12:37:52 +0100
Subject: [PATCH] backport changes from bbmaster2: avoid creation of new
 controller via view/@@controller

---
 browser/main.pt | 2 +-
 browser/view.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/browser/main.pt b/browser/main.pt
index 66b10f6..9df670c 100644
--- a/browser/main.pt
+++ b/browser/main.pt
@@ -1,5 +1,5 @@
 <metal:block define-macro="page"
-             tal:define="controller nocall:view/@@controller;
+             tal:define="controller nocall:view/controller;
                          dummy view/setupSubviews"
              tal:condition="view/update"><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
diff --git a/browser/view.py b/browser/view.py
index c90d94e..07f59cd 100644
--- a/browser/view.py
+++ b/browser/view.py
@@ -87,8 +87,8 @@ class GenericView(object):
         cont = viewAnnotations.get('controller', None)
         if cont is None:
             cont = component.queryMultiAdapter((self, self.request), name='controller')
-            if cont is not None:
-                self.setController(cont)
+            #if cont is not None:
+            #    self.setController(cont)
         return cont
     controller = property(getController, setController)
 
